Changeset 17188 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Timestamp:

2020-10-13T20:21:52+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #19851 - Fix shortcut names

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -102 +102 @@
     public ConflictDialog() {
         super(tr("Conflict"), "conflict", tr("Resolve conflicts"),
-                Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")),
+                Shortcut.registerShortcut("subwindow:conflict", tr("Windows: {0}", tr("Conflict")),
                 KeyEvent.VK_C, Shortcut.ALT_SHIFT), 100);