Index: trunk/src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 17188) @@ -63,5 +63,5 @@ 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); } Index: trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 17188) @@ -35,5 +35,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 17188) @@ -49,5 +49,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 17188) @@ -56,5 +56,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (revision 17188) @@ -30,5 +30,5 @@ 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(); Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 17188) @@ -64,5 +64,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 17188) @@ -58,5 +58,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 17188) @@ -84,8 +84,8 @@ /* 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); Index: trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java (revision 17188) @@ -31,5 +31,5 @@ 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 Index: trunk/src/org/openstreetmap/josm/actions/DistributeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (revision 17188) @@ -40,5 +40,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/ExitAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExitAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/ExitAction.java (revision 17188) @@ -22,5 +22,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java (revision 17188) @@ -46,5 +46,5 @@ 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); } Index: trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (revision 17188) @@ -41,5 +41,5 @@ 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 ); Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 17188) @@ -35,5 +35,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/HelpAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 17188) @@ -34,5 +34,5 @@ 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)); Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (revision 17188) @@ -30,5 +30,6 @@ /** 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); /** Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java (revision 17188) @@ -25,5 +25,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/InfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/InfoAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/InfoAction.java (revision 17188) @@ -27,5 +27,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java (revision 17188) @@ -29,5 +29,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 17188) @@ -469,5 +469,5 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 17188) @@ -67,5 +67,5 @@ 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,5 +81,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/JumpToAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JumpToAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/JumpToAction.java (revision 17188) @@ -54,5 +54,5 @@ 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 Index: trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 17188) @@ -40,5 +40,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 17188) @@ -68,5 +68,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/MirrorAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (revision 17188) @@ -38,5 +38,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/MoveNodeAction.java (revision 17188) @@ -30,5 +30,5 @@ 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")); Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 17188) @@ -64,5 +64,5 @@ "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,5 +99,5 @@ 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), Index: trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 17188) @@ -90,5 +90,6 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/ReorderImageryLayersAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ReorderImageryLayersAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/ReorderImageryLayersAction.java (revision 17188) @@ -24,5 +24,5 @@ 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)); } Index: trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java (revision 17188) @@ -31,5 +31,5 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 17188) @@ -106,5 +106,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 17188) @@ -65,5 +65,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 17188) @@ -56,5 +56,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/TaggingPresetSearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/TaggingPresetSearchAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/TaggingPresetSearchAction.java (revision 17188) @@ -23,5 +23,5 @@ 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); Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 17188) @@ -61,5 +61,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java (revision 17188) @@ -39,5 +39,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/actions/ValidateAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 17188) @@ -45,5 +45,5 @@ 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); } Index: trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/ViewportFollowToggleAction.java (revision 17188) @@ -32,5 +32,5 @@ "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 */ Index: trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java (revision 17188) @@ -27,5 +27,5 @@ "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 */ ); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 17188) @@ -172,5 +172,5 @@ 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(); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 17188) @@ -232,5 +232,5 @@ 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 } Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 17188) @@ -144,5 +144,5 @@ 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")); } Index: trunk/src/org/openstreetmap/josm/gui/MainInitialization.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainInitialization.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/MainInitialization.java (revision 17188) @@ -80,5 +80,5 @@ // help shortcut MainApplication.registerActionShortcut(MainApplication.menu.help, - Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT)); + Shortcut.registerShortcut("system:help", tr("Help: {0}", tr("Help")), KeyEvent.VK_F1, Shortcut.DIRECT)); }), new InitializationTask(tr("Initializing internal boundaries data"), () -> { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 17188) @@ -253,5 +253,5 @@ "changesetdialog", tr("Open the list of changesets in the current layer."), - Shortcut.registerShortcut("subwindow:changesets", tr("Toggle: {0}", tr("Changesets")), + Shortcut.registerShortcut("subwindow:changesets", tr("Windows: {0}", tr("Changesets")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 200, /* the preferred height */ Index: trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 17188) @@ -95,5 +95,5 @@ public CommandStackDialog() { super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."), - Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", + Shortcut.registerShortcut("subwindow:commandstack", tr("Windows: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.ALT_SHIFT), 100); undoTree.addMouseListener(new MouseEventHandler()); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 17188) @@ -102,5 +102,5 @@ 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); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 17188) @@ -81,5 +81,5 @@ public FilterDialog() { super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."), - Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")), + Shortcut.registerShortcut("subwindow:filter", tr("Windows: {0}", tr("Filter")), KeyEvent.VK_F, Shortcut.ALT_SHIFT), 162); build(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 17188) @@ -197,5 +197,5 @@ public LayerListDialog(MainLayerManager layerManager) { super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."), - Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L, + Shortcut.registerShortcut("subwindow:layers", tr("Windows: {0}", tr("Layers")), KeyEvent.VK_L, Shortcut.ALT_SHIFT), 100, true); this.layerManager = layerManager; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 17188) @@ -113,5 +113,5 @@ public MapPaintDialog() { super(tr("Map Paint Styles"), "mapstyle", tr("configure the map painting style"), - Shortcut.registerShortcut("subwindow:mappaint", tr("Toggle: {0}", tr("MapPaint")), + Shortcut.registerShortcut("subwindow:mappaint", tr("Windows: {0}", tr("Map Paint Styles")), KeyEvent.VK_M, Shortcut.ALT_SHIFT), 150, false, MapPaintPreference.class); build(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java (revision 17188) @@ -125,5 +125,5 @@ // CHECKSTYLE.OFF: LineLength /** Action shortcut (ctrl / space by default), made public in order to be used from {@code GettingStarted} page. */ - public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", "Search menu items", KeyEvent.VK_SPACE, Shortcut.CTRL); + public static final Shortcut SHORTCUT = Shortcut.registerShortcut("help:search-items", tr("Help: {0}", tr("Search menu items")), KeyEvent.VK_SPACE, Shortcut.CTRL); // CHECKSTYLE.ON: LineLength Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java (revision 17188) @@ -30,5 +30,5 @@ public MinimapDialog() { super(tr("Mini map"), "minimap", tr("Displays a small map of the current edit location"), - Shortcut.registerShortcut("subwindow:minimap", tr("Toggle: {0}", tr("Mini map")), + Shortcut.registerShortcut("subwindow:minimap", tr("Windows: {0}", tr("Mini map")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 150); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 17188) @@ -77,5 +77,5 @@ public NotesDialog() { super(tr("Notes"), "notes/note_open", tr("List of notes"), - Shortcut.registerShortcut("subwindow:notes", tr("Toggle: {0}", tr("Notes")), + Shortcut.registerShortcut("subwindow:notes", tr("Windows: {0}", tr("Notes")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 150); addCommentAction = new AddCommentAction(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 17188) @@ -148,5 +148,5 @@ public RelationListDialog() { super(tr("Relations"), "relationlist", tr("Open a list of all relations."), - Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), + Shortcut.registerShortcut("subwindow:relations", tr("Windows: {0}", tr("Relations")), KeyEvent.VK_R, Shortcut.ALT_SHIFT), 150, true); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 17188) @@ -148,6 +148,6 @@ public SelectionListDialog() { super(tr("Selection"), "selectionlist", tr("Open a selection list window."), - Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}", - tr("Current Selection")), KeyEvent.VK_T, Shortcut.ALT_SHIFT), + Shortcut.registerShortcut("subwindow:selection", tr("Windows: {0}", + tr("Selection")), KeyEvent.VK_T, Shortcut.ALT_SHIFT), 150, // default height true // default is "show dialog" Index: trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 17188) @@ -72,5 +72,5 @@ public UserListDialog() { super(tr("Authors"), "userlist", tr("Open a list of people working on the selected objects."), - Shortcut.registerShortcut("subwindow:authors", tr("Toggle: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.ALT_SHIFT), 150); + Shortcut.registerShortcut("subwindow:authors", tr("Windows: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.ALT_SHIFT), 150); build(); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 17188) @@ -116,5 +116,5 @@ public ValidatorDialog() { super(tr("Validation Results"), "validator", tr("Open the validation window."), - Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation Results")), + Shortcut.registerShortcut("subwindow:validator", tr("Windows: {0}", tr("Validation Results")), KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150, false, ValidatorPreference.class); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 17188) @@ -255,5 +255,5 @@ public PropertiesDialog() { super(tr("Tags/Memberships"), "propertiesdialog", tr("Tags for selected objects."), - Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Tags/Memberships")), KeyEvent.VK_P, + Shortcut.registerShortcut("subwindow:properties", tr("Windows: {0}", tr("Tags/Memberships")), KeyEvent.VK_P, Shortcut.ALT_SHIFT), 150, true); @@ -1229,5 +1229,5 @@ EditAction() { super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"), - Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S, + Shortcut.registerShortcut("properties:edit", tr("Edit: {0}", tr("Edit Tags")), KeyEvent.VK_S, Shortcut.ALT), false); updateEnabledState(); Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 17188) @@ -100,5 +100,5 @@ private ImageViewerDialog() { super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged", - tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200); + tr("Windows: {0}", tr("Geotagged Images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200); build(); MainApplication.getLayerManager().addActiveLayerChangeListener(this); Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java (revision 17187) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java (revision 17188) @@ -34,6 +34,6 @@ public Action() { super(tr("Search for objects by preset..."), "dialogs/search", tr("Search for objects by their presets."), - Shortcut.registerShortcut("preset:search-objects", tr("Search for objects by preset"), KeyEvent.VK_F3, Shortcut.SHIFT), - false); + Shortcut.registerShortcut("preset:search-objects", tr("Presets: {0}", tr("Search for objects by preset...")), + KeyEvent.VK_F3, Shortcut.SHIFT), false); putValue("toolbar", "presets/search-objects"); MainApplication.getToolbar().register(this);