Index: /trunk/src/org/openstreetmap/josm/actions/JosmAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 12319)
+++ /trunk/src/org/openstreetmap/josm/actions/JosmAction.java	(revision 12320)
@@ -76,5 +76,5 @@
         setHelpId();
         sc = shortcut;
-        if (sc != null) {
+        if (sc != null && !sc.isAutomatic()) {
             Main.registerActionShortcut(this, sc);
         }
@@ -215,5 +215,5 @@
     @Override
     public void destroy() {
-        if (sc != null) {
+        if (sc != null && !sc.isAutomatic()) {
             Main.unregisterActionShortcut(this);
         }
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java	(revision 12319)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java	(revision 12320)
@@ -80,5 +80,5 @@
       * it or registered from within the application.
       *
-      * Plese note that you are not allowed to register any
+      * Please note that you are not allowed to register any
       * shortuts from this hook, but only "systemCuts"!
       *