Changeset 17188 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

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

Author:

Klumbumbus

Message:

fix #19851 - Fix shortcut names

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AboutAction.java (modified) (1 diff)
• AddNodeAction.java (modified) (1 diff)
• AlignInCircleAction.java (modified) (1 diff)
• AlignInLineAction.java (modified) (1 diff)
• ChangesetManagerToggleAction.java (modified) (1 diff)
• CombineWayAction.java (modified) (1 diff)
• CreateCircleAction.java (modified) (1 diff)
• CreateMultipolygonAction.java (modified) (1 diff)
• DialogsToggleAction.java (modified) (1 diff)
• DistributeAction.java (modified) (1 diff)
• ExitAction.java (modified) (1 diff)
• FollowLineAction.java (modified) (1 diff)
• FullscreenToggleAction.java (modified) (1 diff)
• GpxExportAction.java (modified) (1 diff)
• HelpAction.java (modified) (1 diff)
• HistoryInfoAction.java (modified) (1 diff)
• HistoryInfoWebAction.java (modified) (1 diff)
• InfoAction.java (modified) (1 diff)
• InfoWebAction.java (modified) (1 diff)
• JoinAreasAction.java (modified) (1 diff)
• JoinNodeWayAction.java (modified) (2 diffs)
• JumpToAction.java (modified) (1 diff)
• MergeLayerAction.java (modified) (1 diff)
• MergeNodesAction.java (modified) (1 diff)
• MirrorAction.java (modified) (1 diff)
• MoveNodeAction.java (modified) (1 diff)
• OrthogonalizeAction.java (modified) (2 diffs)
• PreferencesAction.java (modified) (1 diff)
• ReorderImageryLayersAction.java (modified) (1 diff)
• ReportBugAction.java (modified) (1 diff)
• ReverseWayAction.java (modified) (1 diff)
• SimplifyWayAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (1 diff)
• TaggingPresetSearchAction.java (modified) (1 diff)
• UnGlueAction.java (modified) (1 diff)
• UnJoinNodeWayAction.java (modified) (1 diff)
• ValidateAction.java (modified) (1 diff)
• ViewportFollowToggleAction.java (modified) (1 diff)
• WireframeToggleAction.java (modified) (1 diff)
• mapmode/DrawAction.java (modified) (1 diff)
• mapmode/ExtrudeAction.java (modified) (1 diff)
• search/SearchAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -63 +63 @@
     public AboutAction() {
         super(tr("About"), "logo", tr("Display the about screen."),
-            Shortcut.registerShortcut("system:about", tr("About"),
+            Shortcut.registerShortcut("system:about", tr("Help: {0}", tr("About")),
             KeyEvent.VK_F1, Shortcut.SHIFT), true, false);
     }

trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

@@ -35 +35 @@
     public AddNodeAction() {
         super(tr("Add Node..."), "addnode", tr("Add a node by entering latitude / longitude or easting / northing."),
-                Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")),
+                Shortcut.registerShortcut("addnode", tr("Tools: {0}", tr("Add Node...")),
                         KeyEvent.VK_D, Shortcut.SHIFT), true);
         setHelpId(ht("/Action/AddNode"));

trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -49 +49 @@
     public AlignInCircleAction() {
         super(tr("Align Nodes in Circle"), "aligncircle", tr("Move the selected nodes into a circle."),
-                Shortcut.registerShortcut("tools:aligncircle", tr("Tool: {0}", tr("Align Nodes in Circle")),
+                Shortcut.registerShortcut("tools:aligncircle", tr("Tools: {0}", tr("Align Nodes in Circle")),
                         KeyEvent.VK_O, Shortcut.DIRECT), true);
         setHelpId(ht("/Action/AlignInCircle"));

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -56 +56 @@
     public AlignInLineAction() {
         super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes in to a line."),
-                Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("tools:alignline", tr("Tools: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.DIRECT), true);
         setHelpId(ht("/Action/AlignInLine"));
     }

trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java

@@ -30 +30 @@
                 tr("Toggle visibility of Changeset Manager window"),
                 Shortcut.registerShortcut("menu:windows:changesetdialog",
-                        tr("Toggle visibility of Changeset Manager window"), KeyEvent.VK_C, Shortcut.ALT_CTRL),
+                        tr("Windows: {0}", tr("Changeset Manager")), KeyEvent.VK_C, Shortcut.ALT_CTRL),
                 true /* register shortcut */, "dialogs/changeset/changesetmanager", false);
         notifySelectedState();

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -64 +64 @@
     public CombineWayAction() {
         super(tr("Combine Way"), "combineway", tr("Combine several ways into one."),
-                Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("tools:combineway", tr("Tools: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.DIRECT), true);
         setHelpId(ht("/Action/CombineWay"));
     }

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -58 +58 @@
     public CreateCircleAction() {
         super(tr("Create Circle"), "aligncircle", tr("Create a circle from three selected nodes."),
-            Shortcut.registerShortcut("tools:createcircle", tr("Tool: {0}", tr("Create Circle")),
+            Shortcut.registerShortcut("tools:createcircle", tr("Tools: {0}", tr("Create Circle")),
             KeyEvent.VK_O, Shortcut.SHIFT), true, "createcircle", true);
         setHelpId(ht("/Action/CreateCircle"));

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -84 +84 @@
                 /* at least three lines for each shortcut or the server extractor fails */
                 update ? Shortcut.registerShortcut("tools:multipoly_update",
-                            tr("Tool: {0}", getName(true)),
+                            tr("Tools: {0}", getName(true)),
                             KeyEvent.VK_B, Shortcut.CTRL_SHIFT)
                        : Shortcut.registerShortcut("tools:multipoly_create",
-                            tr("Tool: {0}", getName(false)),
+                            tr("Tools: {0}", getName(false)),
                             KeyEvent.VK_B, Shortcut.CTRL),
                 true, update ? "multipoly_update" : "multipoly_create", true);

trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java

@@ -31 +31 @@
               new ImageProvider("dialogs/dialogs_panel"),
               tr("Toggle dialogs panel, maximize mapview"),
-              Shortcut.registerShortcut("menu:view:dialogspanel", tr("Toggle dialogs panel"), KeyEvent.VK_TAB, Shortcut.DIRECT),
+              Shortcut.registerShortcut("menu:view:dialogspanel", tr("View: {0}", tr("Dialogs panel")), KeyEvent.VK_TAB, Shortcut.DIRECT),
               true, "dialogspanel", /* register in toolbar */
               false

trunk/src/org/openstreetmap/josm/actions/DistributeAction.java

@@ -40 +40 @@
         super(tr("Distribute Nodes"), "distribute",
               tr("Distribute the selected nodes to equal distances along a line."),
-              Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.SHIFT),
+              Shortcut.registerShortcut("tools:distribute", tr("Tools: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.SHIFT),
               true);
         setHelpId(ht("/Action/DistributeNodes"));

trunk/src/org/openstreetmap/josm/actions/ExitAction.java

@@ -22 +22 @@
     public ExitAction() {
         super(tr("Exit"), "exit", tr("Exit the application."),
-                Shortcut.registerShortcut("system:menuexit", tr("Exit"), KeyEvent.VK_Q, Shortcut.CTRL), true, false);
+                Shortcut.registerShortcut("system:menuexit", tr("File: {0}", tr("Exit")), KeyEvent.VK_Q, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/Exit"));
     }

trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java

@@ -46 +46 @@
                 tr("Continues drawing a line that shares nodes with another line."),
                 Shortcut.registerShortcut("tools:followline", tr(
-                "Tool: {0}", tr("Follow")),
+                "Tools: {0}", tr("Follow")),
                 KeyEvent.VK_F, Shortcut.DIRECT), true);
     }

trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java

@@ -41 +41 @@
               new ImageProvider("fullscreen"),
               tr("Toggle fullscreen view"),
-              Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle fullscreen view"), KeyEvent.VK_F11, Shortcut.DIRECT),
+              Shortcut.registerShortcut("menu:view:fullscreen", tr("View: {0}", tr("Fullscreen view")), KeyEvent.VK_F11, Shortcut.DIRECT),
               false /* register */, null, false
         );

trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

@@ -35 +35 @@
     public GpxExportAction() {
         super(tr("Export to GPX..."), "exportgpx", tr("Export the data to GPX file."),
-                Shortcut.registerShortcut("file:exportgpx", tr("Export to GPX..."), KeyEvent.VK_E, Shortcut.CTRL));
+                Shortcut.registerShortcut("file:exportgpx", tr("File: {0}", tr("Export to GPX...")), KeyEvent.VK_E, Shortcut.CTRL));
         setHelpId(ht("/Action/GpxExport"));
     }

trunk/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -34 +34 @@
     private HelpAction(boolean shortcut) {
         super(tr("Help"), "help", null,
-                shortcut ? Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT) : null,
+                shortcut ? Shortcut.registerShortcut("system:help", tr("Help: {0}", tr("Help")), KeyEvent.VK_F1, Shortcut.DIRECT) : null,
                 true, false);
         setEnabled(!NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE));

trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

@@ -30 +30 @@
 
     /** Action shortcut, made public in order to be used from {@code GettingStarted} page. */
-    public static final Shortcut SHORTCUT = Shortcut.registerShortcut("core:historyinfo", tr("History"), KeyEvent.VK_H, Shortcut.CTRL);
+    public static final Shortcut SHORTCUT = Shortcut.registerShortcut("core:historyinfo", tr("View: {0}", tr("History")),
+        KeyEvent.VK_H, Shortcut.CTRL);
 
     /**

trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java

@@ -25 +25 @@
                 tr("Display history information about OSM ways, nodes, or relations in web browser."),
                 Shortcut.registerShortcut("core:historyinfoweb",
-                        tr("History (web)"), KeyEvent.VK_H, Shortcut.CTRL_SHIFT),
+                        tr("View: {0}", tr("History (web)")), KeyEvent.VK_H, Shortcut.CTRL_SHIFT),
                 true, "action/historyinfoweb", true);
         setHelpId(ht("/Action/ObjectHistoryWeb"));

trunk/src/org/openstreetmap/josm/actions/InfoAction.java

@@ -27 +27 @@
             tr("Display advanced object information about OSM nodes, ways, or relations."),
             Shortcut.registerShortcut("core:info",
-                tr("Advanced info"), KeyEvent.VK_I, Shortcut.CTRL),
+                tr("View: {0}", tr("Advanced info")), KeyEvent.VK_I, Shortcut.CTRL),
             true, "action/info", true);
         setHelpId(ht("/Action/InfoAboutElements"));

trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java

@@ -29 +29 @@
                 tr("Display object information about OSM nodes, ways, or relations in web browser."),
                 Shortcut.registerShortcut("core:infoweb",
-                        tr("Advanced info (web)"), KeyEvent.VK_I, Shortcut.CTRL_SHIFT),
+                        tr("View: {0}", tr("Advanced info (web)")), KeyEvent.VK_I, Shortcut.CTRL_SHIFT),
                 true, "action/infoweb", true);
         setHelpId(ht("/Action/InfoAboutElementsWeb"));

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -469 +469 @@
     public JoinAreasAction(boolean addShortcutToolbarAdapters) {
         super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"), addShortcutToolbarAdapters ?
-        Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")), KeyEvent.VK_J, Shortcut.SHIFT)
+        Shortcut.registerShortcut("tools:joinareas", tr("Tools: {0}", tr("Join overlapping Areas")), KeyEvent.VK_J, Shortcut.SHIFT)
         : null, addShortcutToolbarAdapters, null, addShortcutToolbarAdapters);
         addUndoRedo = addShortcutToolbarAdapters;

trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

@@ -67 +67 @@
                 tr("Join Node to Way"), /* ICON */ "joinnodeway",
                 tr("Include a node into the nearest way segments"),
-                Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join Node to Way")),
+                Shortcut.registerShortcut("tools:joinnodeway", tr("Tools: {0}", tr("Join Node to Way")),
                         KeyEvent.VK_J, Shortcut.DIRECT), true);
         action.setHelpId(ht("/Action/JoinNodeWay"));
@@ -81 +81 @@
                 tr("Move Node onto Way"), /* ICON*/ "movenodeontoway",
                 tr("Move the node onto the nearest way segments and include it"),
-                Shortcut.registerShortcut("tools:movenodeontoway", tr("Tool: {0}", tr("Move Node onto Way")),
+                Shortcut.registerShortcut("tools:movenodeontoway", tr("Tools: {0}", tr("Move Node onto Way")),
                         KeyEvent.VK_N, Shortcut.DIRECT), true);
         action.setHelpId(ht("/Action/MoveNodeWay"));

trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

@@ -54 +54 @@
     public JumpToAction() {
         super(tr("Jump to Position"), "dialogs/position", tr("Opens a dialog that allows to jump to a specific location"),
-                Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump to Position")),
+                Shortcut.registerShortcut("tools:jumpto", tr("View: {0}", tr("Jump to Position")),
                         KeyEvent.VK_J, Shortcut.CTRL), true, "action/jumpto", false);
         // make this action listen to mapframe change events

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -40 +40 @@
             tr("Merge the current layer into another layer"),
             Shortcut.registerShortcut("system:merge", tr("Edit: {0}",
-            tr("Merge")), KeyEvent.VK_M, Shortcut.CTRL),
+            tr("Merge layer")), KeyEvent.VK_M, Shortcut.CTRL),
             true, "action/mergelayer", true);
         setHelpId(ht("/Action/MergeLayer"));

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -68 +68 @@
     public MergeNodesAction() {
         super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."),
-                Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("tools:mergenodes", tr("Tools: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.DIRECT), true);
         setHelpId(ht("/Action/MergeNodes"));
     }

trunk/src/org/openstreetmap/josm/actions/MirrorAction.java

@@ -38 +38 @@
     public MirrorAction() {
         super(tr("Mirror"), "mirror", tr("Mirror selected nodes and ways."),
-                Shortcut.registerShortcut("tools:mirror", tr("Tool: {0}", tr("Mirror")),
+                Shortcut.registerShortcut("tools:mirror", tr("Tools: {0}", tr("Mirror")),
                         KeyEvent.VK_M, Shortcut.SHIFT), true);
         setHelpId(ht("/Action/Mirror"));

trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java

@@ -30 +30 @@
     public MoveNodeAction() {
         super(tr("Move Node..."), "movenode", tr("Edit latitude and longitude of a node."),
-                Shortcut.registerShortcut("movenode", tr("Edit: {0}", tr("Move Node...")),
+                Shortcut.registerShortcut("movenode", tr("Tools: {0}", tr("Move Node...")),
                         KeyEvent.VK_M, Shortcut.NONE), true);
         setHelpId(ht("/Action/MoveNode"));

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -64 +64 @@
                 "ortho",
                 tr("Move nodes so all angles are 90 or 180 degrees"),
-                Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize Shape")),
+                Shortcut.registerShortcut("tools:orthogonalize", tr("Tools: {0}", tr("Orthogonalize Shape")),
                         KeyEvent.VK_Q,
                         Shortcut.DIRECT), true);
@@ -99 +99 @@
             super(tr("Orthogonalize Shape / Undo"), "ortho",
                     tr("Undo orthogonalization for certain nodes"),
-                    Shortcut.registerShortcut("tools:orthogonalizeUndo", tr("Tool: {0}", tr("Orthogonalize Shape / Undo")),
+                    Shortcut.registerShortcut("tools:orthogonalizeUndo", tr("Orthogonalize Shape / Undo"),
                             KeyEvent.VK_Q,
                             Shortcut.SHIFT),

trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java

@@ -90 +90 @@
     public PreferencesAction() {
         super(tr("Preferences..."), "preference", tr("Open a preferences dialog for global settings."),
-                Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true, false);
+                Shortcut.registerShortcut("system:preferences", tr("Edit: {0}", tr("Preferences")), KeyEvent.VK_F12, Shortcut.DIRECT),
+                true, false);
         setHelpId(ht("/Action/Preferences"));
         this.tab = null;

trunk/src/org/openstreetmap/josm/actions/ReorderImageryLayersAction.java

@@ -24 +24 @@
     public ReorderImageryLayersAction() {
         super(tr("Reorder imagery layers"), "dialogs/reorderlayers", tr("Reorders non-overlay imagery layers."),
-            Shortcut.registerMultiShortcuts("imagery:reorder", tr("Reorder imagery layers"),
+            Shortcut.registerMultiShortcuts("imagery:reorder", tr("Imagery: {0}", tr("Reorder imagery layers")),
                     KeyboardUtils.getCharactersForKey('E', 0), Shortcut.DIRECT));
     }

trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java

@@ -31 +31 @@
     public ReportBugAction(String text) {
         super(tr("Report bug"), "bug", tr("Report a ticket to JOSM bugtracker"),
-                Shortcut.registerShortcut("reportbug", tr("Report a ticket to JOSM bugtracker"),
+                Shortcut.registerShortcut("reportbug", tr("Help: {0}", tr("Report bug")),
                         KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true, false);
         this.text = text;

trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -106 +106 @@
     public ReverseWayAction() {
         super(tr("Reverse Ways"), "wayflip", tr("Reverse the direction of all selected ways."),
-                Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("tools:reverse", tr("Tools: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.DIRECT), true);
         setHelpId(ht("/Action/ReverseWays"));
     }

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -65 +65 @@
     public SimplifyWayAction() {
         super(tr("Simplify Way"), "simplify", tr("Delete unnecessary nodes from a way."),
-                Shortcut.registerShortcut("tools:simplify", tr("Tool: {0}", tr("Simplify Way")), KeyEvent.VK_Y, Shortcut.SHIFT), true);
+                Shortcut.registerShortcut("tools:simplify", tr("Tools: {0}", tr("Simplify Way")), KeyEvent.VK_Y, Shortcut.SHIFT), true);
         setHelpId(ht("/Action/SimplifyWay"));
     }

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -56 +56 @@
     public SplitWayAction() {
         super(tr("Split Way"), "splitway", tr("Split a way at the selected node."),
-                Shortcut.registerShortcut("tools:splitway", tr("Tool: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("tools:splitway", tr("Tools: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.DIRECT), true);
         setHelpId(ht("/Action/SplitWay"));
     }

trunk/src/org/openstreetmap/josm/actions/TaggingPresetSearchAction.java

@@ -23 +23 @@
     public TaggingPresetSearchAction() {
         super(tr("Search preset..."), "dialogs/search", tr("Show preset search dialog"),
-                Shortcut.registerShortcut("preset:search", tr("Search presets"), KeyEvent.VK_F3, Shortcut.DIRECT), false);
+                Shortcut.registerShortcut("preset:search", tr("Presets: {0}", tr("Search preset...")), KeyEvent.VK_F3, Shortcut.DIRECT), false);
         setToolbarId("presets/search");
         MainApplication.getToolbar().register(this);

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -61 +61 @@
     public UnGlueAction() {
         super(tr("UnGlue Ways"), "unglueways", tr("Duplicate nodes that are used by multiple ways."),
-                Shortcut.registerShortcut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("tools:unglue", tr("Tools: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.DIRECT), true);
         setHelpId(ht("/Action/UnGlue"));
     }

trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java

@@ -39 +39 @@
                 tr("Disconnect nodes from a way they currently belong to"),
                 Shortcut.registerShortcut("tools:unjoinnodeway",
-                    tr("Tool: {0}", tr("Disconnect Node from Way")), KeyEvent.VK_J, Shortcut.ALT), true);
+                    tr("Tools: {0}", tr("Disconnect Node from Way")), KeyEvent.VK_J, Shortcut.ALT), true);
         setHelpId(ht("/Action/UnJoinNodeWay"));
     }

trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

@@ -45 +45 @@
     public ValidateAction() {
         super(tr("Validation"), "dialogs/validator", tr("Performs the data validation"),
-                Shortcut.registerShortcut("tools:validate", tr("Tool: {0}", tr("Validation")),
+                Shortcut.registerShortcut("tools:validate", tr("Validation"),
                         KeyEvent.VK_V, Shortcut.SHIFT), true);
     }

trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java

@@ -32 +32 @@
               "viewport-follow",
               tr("Enable/disable automatic moving of the map view to last placed node"),
-              Shortcut.registerShortcut("menu:view:viewportfollow", tr("Toggle Viewport Following"),
+              Shortcut.registerShortcut("menu:view:viewportfollow", tr("View: {0}", tr("Viewport Following")),
               KeyEvent.VK_F, Shortcut.CTRL_SHIFT),
               true /* register shortcut */

trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java

@@ -27 +27 @@
               "dialogs/mappaint/wireframe_small",
               tr("Enable/disable rendering the map as wireframe only"),
-              Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"), KeyEvent.VK_W, Shortcut.CTRL),
+              Shortcut.registerShortcut("menu:view:wireframe", tr("View: {0}", tr("Wireframe View")), KeyEvent.VK_W, Shortcut.CTRL),
               false /* register toolbar */
         );

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -172 +172 @@
 
         snappingShortcut = Shortcut.registerShortcut("mapmode:drawanglesnapping",
-                tr("Mode: Draw Angle snapping"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
+                tr("Edit: {0}", tr("Draw Angle snapping")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
         snapChangeAction = new SnapChangeAction();
         snapCheckboxMenuItem = addMenuItem();

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -232 +232 @@
         dualAlignCheckboxMenuItem.setState(dualAlignEnabled);
         dualAlignShortcut = Shortcut.registerShortcut("mapmode:extrudedualalign",
-                tr("Mode: {0}", tr("Extrude Dual alignment")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
+                tr("Edit: {0}", tr("Extrude Dual alignment")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
         readPreferences(); // to show prefernces in table before entering the mode
     }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -144 +144 @@
     public SearchAction() {
         super(tr("Search..."), "dialogs/search", tr("Search for objects"),
-                Shortcut.registerShortcut("system:find", tr("Search..."), KeyEvent.VK_F, Shortcut.CTRL), true);
+                Shortcut.registerShortcut("system:find", tr("Edit: {0}", tr("Search...")), KeyEvent.VK_F, Shortcut.CTRL), true);
         setHelpId(ht("/Action/Search"));
     }