Index: trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java	(revision 4926)
+++ trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java	(revision 4927)
@@ -25,5 +25,5 @@
                 tr("Updates the objects in the active data layer from the server."),
                 Shortcut.registerShortcut("file:updatedata",
-                        tr("Update data"),
+                        tr("File: {0}", tr("Update data")),
                         KeyEvent.VK_U, Shortcut.GROUP_HOTKEY),
                 true);
Index: trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java	(revision 4926)
+++ trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java	(revision 4927)
@@ -26,5 +26,5 @@
                 tr("Updates the currently modified objects from the server (re-downloads data)"),
                 Shortcut.registerShortcut("file:updatemodified",
-                        tr("Update modified"), KeyEvent.VK_M,
+                        tr("File: {0}", tr("Update modified")), KeyEvent.VK_M,
                         Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
                         true);
Index: trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java	(revision 4926)
+++ trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java	(revision 4927)
@@ -87,5 +87,5 @@
                 tr("Updates the currently selected objects from the server (re-downloads data)"),
                 Shortcut.registerShortcut("file:updateselection",
-                        tr("Update selection"), KeyEvent.VK_U,
+                        tr("File: {0}", tr("Update selection")), KeyEvent.VK_U,
                         Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY),
                 true);
Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 4926)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 4927)
@@ -450,5 +450,5 @@
 
     private static int findModifier(int group, Integer modifier) {
-        Integer defaultModifier = getGroupModifier(group + GROUPS_DEFAULT);
+        Integer defaultModifier = getGroupModifier(group);
         if(modifier != null) {
             if(modifier == SHIFT_DEFAULT) {
@@ -484,5 +484,5 @@
             conflictsWith = potentialShortcut;
             defaultModifier = getGroupModifier(requestedGroup + GROUPS_ALT1);
-            if (defaultModifier == null) { // garbage in, no shortcurt out
+            if (defaultModifier == null) { // garbage in, no shortcut out
                 defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT);
             }
@@ -490,5 +490,5 @@
             if (potentialShortcut != null) {
                 defaultModifier = getGroupModifier(requestedGroup + GROUPS_ALT2);
-                if (defaultModifier == null) { // garbage in, no shortcurt out
+                if (defaultModifier == null) { // garbage in, no shortcut out
                     defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT);
                 }