Index: applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/CommandLineAction.java =================================================================== --- applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/CommandLineAction.java (revision 35582) +++ applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/CommandLineAction.java (revision 35583) @@ -15,5 +15,5 @@ public CommandLineAction(CommandLine parentPlugin) { super(tr("Command line"), "commandline", tr("Set input focus to the command line."), - Shortcut.registerShortcut("tool:commandline", tr("Tool: {0}", tr("Command line")), KeyEvent.VK_ENTER, Shortcut.DIRECT), true, "commandline", true); + Shortcut.registerShortcut("tool:commandline", tr("Commands: {0}", tr("Command line")), KeyEvent.VK_ENTER, Shortcut.DIRECT), true, "commandline", true); this.parentPlugin = parentPlugin; } Index: applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java =================================================================== --- applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java (revision 35582) +++ applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java (revision 35583) @@ -36,5 +36,7 @@ public CreateGridOfWaysAction() { - super(tr("Create grid of ways"), "creategridofways", tr("Forms a grid of ways in base to two existing that have various nodes and one in common"), Shortcut.registerShortcut("tools:CreateGridOfWays", tr("Tool: {0}", tr("Create grid of ways")), + super(tr("Create grid of ways"), "creategridofways", + tr("Forms a grid of ways in base to two existing that have various nodes and one in common"), + Shortcut.registerShortcut("tools:CreateGridOfWays", tr("More tools: {0}", tr("Create grid of ways")), KeyEvent.VK_G, Shortcut.SHIFT), true); } Index: applications/editors/josm/plugins/CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAction.java =================================================================== --- applications/editors/josm/plugins/CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAction.java (revision 35582) +++ applications/editors/josm/plugins/CustomizePublicTransportStop/src/org/openstreetmap/josm/plugins/customizepublictransportstop/CustomizeStopAction.java (revision 35583) @@ -58,5 +58,5 @@ CustomizeStopAction action = new CustomizeStopAction(tr(CUSTOMIZE_STOP_ACTION_MENU_NAME), CUSTOMIZE_STOP_ACTION_ICON_NAME, tr(CUSTOMIZE_STOP_ACTION_MENU_TOOLTIP), - Shortcut.registerShortcut("tools:customizestop", tr("Tool: {0}", tr(CUSTOMIZE_STOP_ACTION_MENU_NAME)), + Shortcut.registerShortcut("tools:customizestop", tr("Tools: {0}", tr(CUSTOMIZE_STOP_ACTION_MENU_NAME)), KeyEvent.VK_U, Shortcut.DIRECT), true); Index: applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java =================================================================== --- applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java (revision 35582) +++ applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java (revision 35583) @@ -32,5 +32,5 @@ public UploadAction(){ super(tr("Upload Traces"), "UploadAction", tr("Uploads traces to openstreetmap.org"), - Shortcut.registerShortcut("tools:uploadtraces", tr("Tool: {0}", tr("Upload Traces")), + Shortcut.registerShortcut("tools:uploadtraces", tr("GPS: {0}", tr("Upload Traces")), KeyEvent.VK_G, Shortcut.CTRL), false); } Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java =================================================================== --- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 35582) +++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (revision 35583) @@ -28,6 +28,6 @@ super(tr("Fix street addresses"), "fixstreets_24", tr("Find and fix addresses without (valid) streets."), - Shortcut.registerShortcut("tools:AddressEdit", tr("Tool: {0}", - tr("Address Edit")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), false); + Shortcut.registerShortcut("tools:AddressEdit", tr("Data: {0}", + tr("Fix street addresses")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), false); setEnabled(false); Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java =================================================================== --- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java (revision 35582) +++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java (revision 35583) @@ -21,5 +21,5 @@ public AddrInterpolationAction() { super(tr("Address Interpolation"), "AddrInterpolation", tr("Handy Address Interpolation Functions"), - Shortcut.registerShortcut("tools:AddressInterpolation", tr("Tool: {0}", tr("Address Interpolation")), + Shortcut.registerShortcut("tools:AddressInterpolation", tr("Data: {0}", tr("Address Interpolation")), KeyEvent.VK_Z, Shortcut.ALT_CTRL), false); setEnabled(false); Index: applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java =================================================================== --- applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java (revision 35582) +++ applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java (revision 35583) @@ -31,5 +31,5 @@ tr("Makes a pair of selected way segments parallel by rotating one of them " + "around a chosen pivot."), - Shortcut.registerShortcut("tools:alignways", tr("Tool: {0}", tr("Align Ways")), + Shortcut.registerShortcut("tools:alignways", tr("More tools: {0}", tr("Align Way Segments")), KeyEvent.VK_SPACE, Shortcut.SHIFT), true, false); Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java =================================================================== --- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java (revision 35582) +++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java (revision 35583) @@ -48,5 +48,5 @@ tr("Connect to gpsd server and show current position in LiveGPS layer."), Shortcut.registerShortcut("menu:livegps:capture", tr( - "Menu: {0}", tr("Capture GPS Track")), + "GPS: {0}", tr("Capture GPS Track")), KeyEvent.VK_R, Shortcut.CTRL), true); } @@ -62,5 +62,5 @@ super(tr("Center Once"), "centermenu", tr("Center the LiveGPS layer to current position."), - Shortcut.registerShortcut("edit:centergps", tr("Edit: {0}", + Shortcut.registerShortcut("edit:centergps", tr("GPS: {0}", tr("Center Once")), KeyEvent.VK_HOME, Shortcut.DIRECT), true); @@ -82,5 +82,5 @@ tr("Continuously center the LiveGPS layer to current position."), Shortcut.registerShortcut("menu:livegps:autocenter", tr( - "Menu: {0}", tr("Capture GPS Track")), + "GPS: {0}", tr("Auto-Center")), KeyEvent.VK_HOME, Shortcut.CTRL), true); } Index: applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java =================================================================== --- applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java (revision 35582) +++ applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java (revision 35583) @@ -57,5 +57,5 @@ super(tr("Merge overlap"), "merge_overlap", tr("Merge overlap of ways."), - Shortcut.registerShortcut("tools:mergeoverlap",tr("Tool: {0}", tr("Merge overlap")), KeyEvent.VK_O, + Shortcut.registerShortcut("tools:mergeoverlap",tr("More tools: {0}", tr("Merge overlap")), KeyEvent.VK_O, Shortcut.ALT_CTRL), true); } Index: applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java =================================================================== --- applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java (revision 35582) +++ applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java (revision 35583) @@ -55,5 +55,5 @@ tr("Adds no left turn for sets of 4 or 5 ways."), Shortcut.registerShortcut("tools:michigan_left", - tr("Tool: {0}", tr("Michigan Left")), KeyEvent.VK_N, Shortcut.ALT_SHIFT), true); + tr("Data: {0}", tr("Michigan Left")), KeyEvent.VK_N, Shortcut.ALT_SHIFT), true); } Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PdfImportAction.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PdfImportAction.java (revision 35582) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PdfImportAction.java (revision 35583) @@ -19,5 +19,5 @@ super(tr("Import PDF file"), "pdf_import", tr("Import PDF file."), - Shortcut.registerShortcut("tools:pdfimport", tr("Tool: {0}", tr("Import PDF file")), + Shortcut.registerShortcut("tools:pdfimport", tr("Imagery: {0}", tr("Import PDF file")), KeyEvent.VK_F, Shortcut.ALT_CTRL_SHIFT), true); } Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java (revision 35582) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java (revision 35583) @@ -42,5 +42,5 @@ PointInfoAction() { super(tr("Point info"), "pointinfo", tr("Point info."), - Shortcut.registerShortcut("tools:pointInfo", tr("Tool: {0}", tr("Point info")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), + Shortcut.registerShortcut("tools:pointInfo", tr("More tools: {0}", tr("Point info")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), getCursor()); } Index: applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/AutoSaveAction.java =================================================================== --- applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/AutoSaveAction.java (revision 35582) +++ applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/AutoSaveAction.java (revision 35583) @@ -32,5 +32,5 @@ public AutoSaveAction() { super(tr("AutoSave LiveData"), "autosave.png", tr("Save captured data to file every minute."), - Shortcut.registerShortcut("surveyor:autosave", tr("Tool: {0}", tr("AutoSave LiveData")), + Shortcut.registerShortcut("surveyor:autosave", tr("GPS: {0}", tr("AutoSave LiveData")), KeyEvent.VK_S, Shortcut.ALT_CTRL_SHIFT), true); } Index: applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/SurveyorShowAction.java =================================================================== --- applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/SurveyorShowAction.java (revision 35582) +++ applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/SurveyorShowAction.java (revision 35583) @@ -44,5 +44,5 @@ public SurveyorShowAction(LiveGpsPlugin gpsPlugin) { super(tr("Surveyor..."), "surveyormenu.png", tr("Open surveyor tool."), - Shortcut.registerShortcut("surveyor:open", tr("Tool: {0}", tr("Surveyor...")), + Shortcut.registerShortcut("surveyor:open", tr("GPS: {0}", tr("Surveyor...")), KeyEvent.VK_R, Shortcut.CTRL_SHIFT), true); this.gpsPlugin = gpsPlugin; Index: applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java =================================================================== --- applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java (revision 35582) +++ applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java (revision 35583) @@ -46,5 +46,6 @@ public TracerAction() { - super(tr("Tracer"), "tracer-sml", tr("Tracer."), Shortcut.registerShortcut("tools:tracer", tr("Tool: {0}", tr("Tracer")), KeyEvent.VK_T, Shortcut.DIRECT), getCursor()); + super(tr("Tracer"), "tracer-sml", tr("Tracer."), + Shortcut.registerShortcut("tools:tracer", tr("More tools: {0}", tr("Tracer")), KeyEvent.VK_T, Shortcut.DIRECT), getCursor()); } Index: applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java =================================================================== --- applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java (revision 35582) +++ applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java (revision 35583) @@ -60,5 +60,5 @@ TracerAction() { super(tr("Tracer2"), "tracer2-sml", tr("Tracer2."), - Shortcut.registerShortcut("tools:tracer2", tr("Tool: {0}", tr("Tracer2")), KeyEvent.VK_T, Shortcut.DIRECT), + Shortcut.registerShortcut("tools:tracer2", tr("More tools: {0}", tr("Tracer2")), KeyEvent.VK_T, Shortcut.DIRECT), getCursor()); } Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java (revision 35582) +++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java (revision 35583) @@ -43,5 +43,5 @@ null, tr("Create or edit a turn restriction."), - Shortcut.registerShortcut("tools:turnrestriction", tr("Tool: {0}", "Create or edit a turn restriction."), + Shortcut.registerShortcut("tools:turnrestriction", tr("Create or edit a turn restriction."), KeyEvent.VK_2, Shortcut.ALT_SHIFT), false