Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 8951)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 8952)
@@ -434,5 +434,4 @@
     private static Shortcut registerShortcut(String shortText, String longText, int requestedKey, int requestedGroup, Integer modifier) {
         doInit();
-        Integer defaultModifier = findModifier(requestedGroup, modifier);
         if (shortcuts.containsKey(shortText)) { // a re-register? maybe a sc already read from the preferences?
             Shortcut sc = shortcuts.get(shortText);
@@ -441,4 +440,5 @@
             return sc;
         }
+        Integer defaultModifier = findModifier(requestedGroup, modifier);
         Shortcut conflict = findShortcut(requestedKey, defaultModifier);
         if (conflict != null) {
@@ -447,4 +447,5 @@
                 int newmodifier = findNewOsxModifier(requestedGroup);
                 if (findShortcut(requestedKey, newmodifier) == null) {
+                    Main.info("Reassigning OSX shortcut '" + shortText + "' from Meta to Ctrl because of conflict with " + conflict);
                     return reassignShortcut(shortText, longText, requestedKey, conflict, requestedGroup, requestedKey, newmodifier);
                 }
@@ -454,4 +455,6 @@
                     int newmodifier = getGroupModifier(m);
                     if (findShortcut(k, newmodifier) == null) {
+                        Main.info("Reassigning shortcut '" + shortText + "' from " + modifier + " to " + newmodifier +
+                                " because of conflict with " + conflict);
                         return reassignShortcut(shortText, longText, requestedKey, conflict, m, k, newmodifier);
                     }