Index: applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 35578)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 35579)
@@ -27,5 +27,5 @@
               "home-icon32", 
               "Launches the HouseNumberTaggingTool dialog", 
-              Shortcut.registerShortcut("edit:housenumbertaggingtool", "HouseNumberTaggingTool", KeyEvent.VK_K, Shortcut.DIRECT),
+              Shortcut.registerShortcut("edit:housenumbertaggingtool", tr("Data: {0}", "HouseNumberTaggingTool"), KeyEvent.VK_K, Shortcut.DIRECT),
               true);
 
Index: applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java
===================================================================
--- applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java	(revision 35578)
+++ applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java	(revision 35579)
@@ -94,5 +94,5 @@
             super(tr("Edit opening hours"), "opening_hours.png",
                     tr("Edit time-tag of selected element in a graphical interface"), Shortcut.registerShortcut(
-                            "tools:opening_hourseditor", tr("Tool: {0}", tr("Edit opening hours")), KeyEvent.VK_O,
+                            "tools:opening_hourseditor", tr("Data: {0}", tr("Edit opening hours")), KeyEvent.VK_O,
                             Shortcut.ALT_CTRL_SHIFT), true);
         }
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingSizeAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingSizeAction.java	(revision 35578)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingSizeAction.java	(revision 35579)
@@ -14,5 +14,5 @@
     public BuildingSizeAction() {
         super(tr("Set buildings size"), "mapmode/building", tr("Set buildings size"),
-                Shortcut.registerShortcut("edit:buildingsdialog", tr("Edit: {0}", tr("Set buildings size")),
+                Shortcut.registerShortcut("edit:buildingsdialog", tr("Data: {0}", tr("Set buildings size")),
                 KeyEvent.VK_B, Shortcut.ALT_CTRL),
                 true, "edit:buildingsdialog", false);
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java	(revision 35578)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java	(revision 35579)
@@ -44,5 +44,5 @@
         super(tr("Merge address points"), "mergeaddr",
                 tr("Move tags from address nodes inside buildings to building ways"),
-                Shortcut.registerShortcut("edit:mergeaddrpoints", tr("Edit: {0}", tr("Merge address points")),
+                Shortcut.registerShortcut("edit:mergeaddrpoints", tr("Data: {0}", tr("Merge address points")),
                         KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
                 true);
Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
===================================================================
--- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java	(revision 35578)
+++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java	(revision 35579)
@@ -100,5 +100,5 @@
     {
         super(tr("Measured values"), "measure", tr("Open the measurement window."),
-                Shortcut.registerShortcut("subwindow:measurement", tr("Toggle: {0}", tr("Measured values")),
+                Shortcut.registerShortcut("subwindow:measurement", tr("Windows: {0}", tr("Measured values")),
                         KeyEvent.VK_U, Shortcut.CTRL_SHIFT), 150);
 
Index: applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java	(revision 35578)
+++ applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java	(revision 35579)
@@ -18,5 +18,5 @@
     public RevertChangesetAction() {
         super(tr("Revert changeset"), "revert-changeset", tr("Revert changeset"),
-            Shortcut.registerShortcut("tool:revert", tr("Tool: {0}", tr("Revert changeset")), KeyEvent.VK_T, Shortcut.CTRL_SHIFT),
+            Shortcut.registerShortcut("tool:revert", tr("Data: {0}", tr("Revert changeset")), KeyEvent.VK_T, Shortcut.CTRL_SHIFT),
                 true, false);
     }
Index: applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java
===================================================================
--- applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java	(revision 35578)
+++ applications/editors/josm/plugins/simplifyarea/src/org/openstreetmap/josm/plugins/simplifyarea/SimplifyAreaAction.java	(revision 35579)
@@ -46,5 +46,5 @@
     public SimplifyAreaAction() {
         super(tr("Simplify Area"), "simplify", tr("Delete unnecessary nodes from an area."),
-                Shortcut.registerShortcut("tools:simplifyArea", tr("Tool: {0}", tr("Simplify Area")), KeyEvent.VK_Y, Shortcut.CTRL_SHIFT),
+                Shortcut.registerShortcut("tools:simplifyArea", tr("More tools: {0}", tr("Simplify Area")), KeyEvent.VK_Y, Shortcut.CTRL_SHIFT),
                 true, "simplifyarea", true);
     }
Index: applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java	(revision 35578)
+++ applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java	(revision 35579)
@@ -26,5 +26,5 @@
         tr("Open the tagging preset test tool for previewing tagging preset dialogs."),
         Shortcut.registerShortcut("tools:taggingpresettester",
-        tr("Tool: {0}", tr("Tagging Preset Tester")),
+        tr("Windows: {0}", tr("Tagging Preset Tester")),
         KeyEvent.VK_T, Shortcut.ALT_CTRL_SHIFT), true);
         MainMenu.addAfter(MainApplication.getMenu().windowMenu, this, false, MainApplication.getMenu().changesetManager);
Index: applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/ReverseTerraceAction.java
===================================================================
--- applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/ReverseTerraceAction.java	(revision 35578)
+++ applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/ReverseTerraceAction.java	(revision 35579)
@@ -42,5 +42,5 @@
             tr("Reverses house numbers on a terrace."),
             Shortcut.registerShortcut("tools:ReverseTerrace",
-                    tr("Tool: {0}", tr("Reverse a Terrace")),
+                    tr("More tools: {0}", tr("Reverse a terrace")),
                     KeyEvent.VK_V, Shortcut.ALT_CTRL_SHIFT),
                         true);
Index: applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java
===================================================================
--- applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java	(revision 35578)
+++ applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java	(revision 35579)
@@ -71,5 +71,5 @@
         super(tr("Terrace a building"), "terrace",
                 tr("Creates individual buildings from a long building."),
-                Shortcut.registerShortcut("tools:Terracer", tr("Tool: {0}",
+                Shortcut.registerShortcut("tools:Terracer", tr("More tools: {0}",
                         tr("Terrace a building")), KeyEvent.VK_T,
                         Shortcut.SHIFT), true);
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AddIntersectionsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AddIntersectionsAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AddIntersectionsAction.java	(revision 35579)
@@ -38,5 +38,5 @@
     public AddIntersectionsAction() {
         super(tr("Add nodes at intersections"), "addintersect", tr("Add missing nodes at intersections of selected ways."),
-                Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")),
+                Shortcut.registerShortcut("tools:addintersect", tr("More tools: {0}", tr("Add nodes at intersections")),
                         KeyEvent.VK_I, Shortcut.SHIFT),
                 true);
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AlignWayNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AlignWayNodesAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/AlignWayNodesAction.java	(revision 35579)
@@ -40,5 +40,5 @@
     public AlignWayNodesAction() {
         super(TITLE, "dumbutils/alignwaynodes", tr("Align nodes in a way"),
-                Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut.SHIFT),
+                Shortcut.registerShortcut("tools:alignwaynodes", tr("More tools: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut.SHIFT),
                 true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java	(revision 35579)
@@ -40,5 +40,5 @@
         super(tr("Extract node"), "extnode",
                 tr("Extracts node from a way"),
-                Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}", "Extract node"),
+                Shortcut.registerShortcut("tools:extnode", tr("More tools: {0}", "Extract node"),
                         KeyEvent.VK_J, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/ExtractNode"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java	(revision 35579)
@@ -40,5 +40,6 @@
     public PasteRelationsAction() {
         super(TITLE, "dumbutils/pasterelations", tr("Paste relation membership from objects in the buffer onto selected object(s)"),
-              Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}", tr("Paste Relations")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
+              Shortcut.registerShortcut("tools:pasterelations", tr("More tools: {0}", tr("Paste Relations")), KeyEvent.CHAR_UNDEFINED,
+                Shortcut.NONE),
               true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitObjectAction.java	(revision 35579)
@@ -44,5 +44,5 @@
     public SplitObjectAction() {
         super(tr("Split Object"), "splitobject", tr("Split an object at the selected nodes."),
-                Shortcut.registerShortcut("tools:splitobject", tr("Tool: {0}", tr("Split Object")), KeyEvent.VK_X, Shortcut.ALT),
+                Shortcut.registerShortcut("tools:splitobject", tr("More tools: {0}", tr("Split Object")), KeyEvent.VK_X, Shortcut.ALT),
                 true);
         putValue("help", ht("/Action/SplitObject"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java	(revision 35579)
@@ -37,5 +37,5 @@
     public SplitOnIntersectionsAction() {
         super(TITLE, "dumbutils/splitonintersections", TOOL_DESC,
-            Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", tr("Split adjacent ways")),
+            Shortcut.registerShortcut("tools:splitonintersections", tr("More tools: {0}", tr("Split adjacent ways")),
             KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT),
             true);
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java	(revision 35579)
@@ -40,5 +40,5 @@
     public SymmetryAction() {
         super(tr("Symmetry"), "symmetry", tr("Mirror selected nodes and ways."),
-                Shortcut.registerShortcut("tools:symmetry", tr("Tool: {0}", tr("Symmetry")),
+                Shortcut.registerShortcut("tools:symmetry", tr("More tools: {0}", tr("Symmetry")),
                         KeyEvent.VK_S, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/Symmetry"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java	(revision 35579)
@@ -36,5 +36,5 @@
     public TagBufferAction() {
         super(TITLE, "dumbutils/tagbuffer", tr("Paste tags from the previously selected object(s) (not from clipboard)."),
-                Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr("Paste tags from previous selection")),
+                Shortcut.registerShortcut("tools:tagbuffer", tr("More tools: {0}", tr("Paste tags from previous selection")),
                         KeyEvent.VK_R, Shortcut.SHIFT),
                 true, false);
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java	(revision 35579)
@@ -29,5 +29,5 @@
     public TagSourceAction() {
         super(TITLE, "dumbutils/sourcetag", tr("Add remembered source tag"),
-                Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.ALT_CTRL),
+                Shortcut.registerShortcut("tools:sourcetag", tr("More tools: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.ALT_CTRL),
                 true, false);
         source = Config.getPref().get("sourcetag.value");
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java	(revision 35579)
@@ -41,5 +41,5 @@
     public UnGlueRelationAction() {
         super(tr("UnGlue Relation"), "ungluerelations", tr("Duplicate nodes, ways and relations that are used by multiple relations."),
-                Shortcut.registerShortcut("tools:ungluerelation", tr("Tool: {0}", tr("UnGlue Relations")), KeyEvent.VK_G, Shortcut.ALT_SHIFT),
+                Shortcut.registerShortcut("tools:ungluerelation", tr("More tools: {0}", tr("UnGlue Relation")), KeyEvent.VK_G, Shortcut.ALT_SHIFT),
                 true);
         putValue("help", ht("/Action/UnGlueRelation"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CurveAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CurveAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/curves/CurveAction.java	(revision 35579)
@@ -35,6 +35,5 @@
     public CurveAction() {
         super(tr("Circle arc"), "circlearc", tr("Create a circle arc"),
-                Shortcut.registerShortcut("tools:createcurve", tr("Tool: {0}", tr("Create a circle arc")), KeyEvent.VK_C,
-                        Shortcut.SHIFT), true);
+                Shortcut.registerShortcut("tools:createcurve", tr("More tools: {0}", tr("Circle arc")), KeyEvent.VK_C, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/CreateCircleArc"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java	(revision 35579)
@@ -36,5 +36,5 @@
         super(tr("Open custom URL"), "openurl",
                 tr("Opens specified URL browser"),
-                Shortcut.registerShortcut("tools:openurl", tr("Tool: {0}", tr("Open custom URL")),
+                Shortcut.registerShortcut("tools:openurl", tr("Data: {0}", tr("Open custom URL")),
                         KeyEvent.VK_H, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/OpenPage"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java	(revision 35579)
@@ -32,5 +32,5 @@
     public LatLonAction() {
         super(tr("Lat Lon tool"), "latlon", tr("Create geometry by entering lat lon coordinates for it."),
-                Shortcut.registerShortcut("latlon", tr("Edit: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut.CTRL_SHIFT), true);
+                Shortcut.registerShortcut("latlon", tr("More tools: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/AddNode"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/multitagger/MultiTagAction.java	(revision 35579)
@@ -25,5 +25,5 @@
     public MultiTagAction() {
         super(tr("Tag multiple objects [alpha]"), (String) null, tr("Edit tags of object list in table"),
-                Shortcut.registerShortcut("multitag", tr("Edit: {0}", tr("Tag multiple objects")), KeyEvent.VK_T, Shortcut.CTRL),
+                Shortcut.registerShortcut("multitag", tr("Data: {0}", tr("Tag multiple objects")), KeyEvent.VK_T, Shortcut.CTRL),
                 true, "multitag", true);
         putValue("help", ht("/Action/MultiTag"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryAction.java	(revision 35579)
@@ -28,5 +28,5 @@
     public ReplaceGeometryAction() {
         super(TITLE, "dumbutils/replacegeometry", tr("Replace geometry of selected object with a new one"),
-                Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut.CTRL_SHIFT),
+                Shortcut.registerShortcut("tools:replacegeometry", tr("More tools: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut.CTRL_SHIFT),
                 true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java	(revision 35579)
@@ -28,5 +28,5 @@
     public AdjacentNodesAction() {
         super(tr("Adjacent nodes"), "adjnodes", tr("Select adjacent nodes"),
-                Shortcut.registerShortcut("tools:adjnodes", tr("Tool: {0}", "Adjacent nodes"),
+                Shortcut.registerShortcut("tools:adjnodes", tr("Selection: {0}", tr("Adjacent nodes")),
                         KeyEvent.VK_E, Shortcut.DIRECT), true);
         putValue("help", ht("/Action/AdjacentNodes"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java	(revision 35579)
@@ -28,5 +28,5 @@
         super(tr("Adjacent ways"), "adjways",
                 tr("Adjacent ways will be selected. Nodes will be deselected."),
-                Shortcut.registerShortcut("tools:adjways", tr("Tool: {0}", "Adjacent ways"),
+                Shortcut.registerShortcut("tools:adjways", tr("Selection: {0}", tr("Adjacent ways")),
                         KeyEvent.VK_E, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/AdjacentWays"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java	(revision 35579)
@@ -25,5 +25,5 @@
     public ConnectedWaysAction() {
         super(tr("All connected ways"), "adjwaysall", tr("Select all connected ways"),
-                Shortcut.registerShortcut("tools:adjwaysall", tr("Tool: {0}", "All connected ways"),
+                Shortcut.registerShortcut("tools:adjwaysall", tr("Selection: {0}", tr("All connected ways")),
                         KeyEvent.VK_E, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/SelectConnectedWays"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java	(revision 35579)
@@ -27,5 +27,5 @@
     public IntersectedWaysAction() {
         super(tr("Intersecting ways"), "intway", tr("Select intersecting ways"),
-                Shortcut.registerShortcut("tools:intway", tr("Tool: {0}", "Intersecting ways"),
+                Shortcut.registerShortcut("tools:intway", tr("Selection: {0}", tr("Intersecting ways")),
                         KeyEvent.VK_I, Shortcut.DIRECT), true);
         putValue("help", ht("/Action/SelectIntersectingWays"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java	(revision 35579)
@@ -27,5 +27,5 @@
     public IntersectedWaysRecursiveAction() {
         super(tr("All intersecting ways"), "intwayall", tr("Select all intersecting ways"),
-                Shortcut.registerShortcut("tools:intwayall", tr("Tool: {0}", "All intersecting ways"),
+                Shortcut.registerShortcut("tools:intwayall", tr("Selection: {0}", tr("All intersecting ways")),
                         KeyEvent.VK_MULTIPLY, Shortcut.CTRL), true);
         putValue("help", ht("/Action/SelectAllIntersectingWays"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java	(revision 35579)
@@ -29,5 +29,5 @@
     public MiddleNodesAction() {
         super(tr("Middle nodes"), "midnodes", tr("Select middle nodes"),
-                Shortcut.registerShortcut("tools:midnodes", tr("Tool: {0}", "Middle nodes"), KeyEvent.VK_E, Shortcut.ALT_SHIFT), true);
+                Shortcut.registerShortcut("tools:midnodes", tr("Selection: {0}", tr("Middle nodes")), KeyEvent.VK_E, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/MiddleNodes"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java	(revision 35579)
@@ -25,5 +25,5 @@
     public SelectAllInsideAction() {
         super(tr("All inside [testing]"), "selinside", tr("Select all inside selected polygons"),
-                Shortcut.registerShortcut("tools:selinside", tr("Tool: {0}", "All inside"),
+                Shortcut.registerShortcut("tools:selinside", tr("Selection: {0}", tr("All inside")),
                         KeyEvent.VK_I, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/SelectAllInside"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java	(revision 35579)
@@ -34,5 +34,5 @@
     public SelectBoundaryAction() {
         super(tr("Area boundary [testing]"), "selboundary", tr("Select relation or all ways that forms area boundary"),
-                Shortcut.registerShortcut("tools:selboundary", tr("Tool: {0}", "Area boundary [testing]"),
+                Shortcut.registerShortcut("tools:selboundary", tr("Selection: {0}", tr("Area boundary [testing]")),
                         KeyEvent.VK_SLASH, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/SelectAreaBoundary"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java	(revision 35579)
@@ -35,5 +35,5 @@
     public SelectHighwayAction() {
         super(tr("Select Highway"), "selecthighway", tr("Select highway for the name/ref given"),
-                Shortcut.registerShortcut("tools:selecthighway", tr("Tool: {0}", "Select Highway"),
+                Shortcut.registerShortcut("tools:selecthighway", tr("Selection: {0}", tr("Select Highway")),
                         KeyEvent.VK_W, Shortcut.ALT_CTRL), true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java	(revision 35579)
@@ -28,5 +28,5 @@
         super(tr("Select last modified nodes"), "selmodnodes",
                 tr("Select last modified nodes"),
-                Shortcut.registerShortcut("tools:selmodnodes", tr("Tool: {0}", "Select last modified nodes"),
+                Shortcut.registerShortcut("tools:selmodnodes", tr("Selection: {0}", tr("Select last modified nodes")),
                         KeyEvent.VK_Z, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/SelectLastModifiedNodes"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java	(revision 35579)
@@ -28,5 +28,5 @@
         super(tr("Select last modified ways"), "selmodways",
                 tr("Select last modified ways"),
-                Shortcut.registerShortcut("tools:selmodways", tr("Tool: {0}", "Select last modified ways"),
+                Shortcut.registerShortcut("tools:selmodways", tr("Selection: {0}", tr("Select last modified ways")),
                         KeyEvent.VK_Z, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/SelectLastModifiedWays"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java	(revision 35579)
@@ -27,5 +27,5 @@
     public SelectWayNodesAction() {
         super(tr("Select Way Nodes"), "selectwaynodes", tr("Select all nodes of a selected way."),
-                Shortcut.registerShortcut("tools:selectwaynodes", tr("Tool: {0}", tr("Select Way Nodes")),
+                Shortcut.registerShortcut("tools:selectwaynodes", tr("Selection: {0}", tr("Select Way Nodes")),
                         KeyEvent.VK_N, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/SelectWayNodes"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java	(revision 35579)
@@ -25,5 +25,5 @@
         super(tr("Undo selection"), "undoselection",
                 tr("Reselect last added object or selection form history"),
-                Shortcut.registerShortcut("tools:undoselection", tr("Tool: {0}", "Undo selection"),
+                Shortcut.registerShortcut("tools:undoselection", tr("Selection: {0}", tr("Undo selection")),
                         KeyEvent.VK_Z, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/UndoSelection"));
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UnselectNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UnselectNodesAction.java	(revision 35578)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UnselectNodesAction.java	(revision 35579)
@@ -24,5 +24,5 @@
         super(tr("Unselect nodes"), "unsnodes",
                 tr("Removes all nodes from selection"),
-                Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}", "Unselect nodes"),
+                Shortcut.registerShortcut("tools:unsnodes", tr("Selection: {0}", tr("Unselect nodes")),
                         KeyEvent.VK_U, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/UnselectNodes"));
