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 11949)
+++ applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java	(revision 12588)
@@ -16,4 +16,5 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.tools.Shortcut;
 /**
  *
@@ -22,23 +23,21 @@
 public class UploadDataGuiPlugin extends Plugin{
     UploadAction openaction;
-        
-public UploadDataGuiPlugin() {
-        
-    openaction = new UploadAction();
-    Main.main.menu.toolsMenu.add(openaction);
+
+    public UploadDataGuiPlugin() {
+        openaction = new UploadAction();
+        Main.main.menu.toolsMenu.add(openaction);
     }
 
-class UploadAction extends JosmAction {
-      
+    class UploadAction extends JosmAction {
+
         public UploadAction(){
-            super(tr("Upload Traces"), "UploadAction", tr("Uploads traces to openstreetmap.org"), KeyEvent.VK_G, KeyEvent.CTRL_MASK,
-            false);
+            super(tr("Upload Traces"), "UploadAction", tr("Uploads traces to openstreetmap.org"),
+            Shortcut.registerShortcut("tools:uploadtraces", tr("Tool: {0}", tr("Upload Traces")),
+            KeyEvent.VK_G, Shortcut.GROUP_MENU), false);
         }
         public void actionPerformed(ActionEvent e) {
             UploadDataGui go = new UploadDataGui();
             go.setVisible(true);
-     
-            }
-     }
-     
+        }
+    }
 }