Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 4499)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 4500)
@@ -353,5 +353,5 @@
 
         if (!Main.pref.getBoolean("audio.menuinvisible", false)) {
-            audioMenu = addMenu(marktr("Audio"), KeyEvent.VK_A, defaultMenuPos, ht("/Menu/Audio"));
+            audioMenu = addMenu(marktr("Audio"), KeyEvent.VK_U, defaultMenuPos, ht("/Menu/Audio"));
             add(audioMenu, audioPlayPause);
             add(audioMenu, audioNext);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 4499)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 4500)
@@ -183,6 +183,4 @@
     private CopyAllKeyValueAction copyAllKeyValueAction = new CopyAllKeyValueAction();
     private AddAction addAction = new AddAction();
-    private Shortcut addActionShortcut = Shortcut.registerShortcut("properties:add", tr("Add Properties"), KeyEvent.VK_B,
-            Shortcut.GROUP_MNEMONIC);
 
     @Override
@@ -192,5 +190,4 @@
         MapView.addEditLayerChangeListener(this);
         updateSelection();
-        Main.registerActionShortcut(addAction, addActionShortcut);
     }
 
@@ -200,5 +197,4 @@
         SelectionEventManager.getInstance().removeSelectionListener(this);
         MapView.removeEditLayerChangeListener(this);
-        Main.unregisterActionShortcut(addAction, addActionShortcut);
     }
 
@@ -1070,5 +1066,5 @@
             putValue(SHORT_DESCRIPTION, tr("Delete the selected key in all objects"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
-            Shortcut s = Shortcut.registerShortcut("properties:delete", tr("Delete Properties"), KeyEvent.VK_Q,
+            Shortcut s = Shortcut.registerShortcut("properties:delete", tr("Delete Properties"), KeyEvent.VK_D,
                     Shortcut.GROUP_MNEMONIC);
             putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
@@ -1103,4 +1099,7 @@
             putValue(SHORT_DESCRIPTION, tr("Add a new key/value pair to all objects"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
+            Shortcut s = Shortcut.registerShortcut("properties:add", tr("Add Property"), KeyEvent.VK_A,
+                    Shortcut.GROUP_MNEMONIC);
+            putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
         }
 
@@ -1115,4 +1114,7 @@
             putValue(SHORT_DESCRIPTION, tr("Edit the value of the selected key for all objects"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
+            Shortcut s = Shortcut.registerShortcut("properties:edit", tr("Edit Properties"), KeyEvent.VK_S,
+                    Shortcut.GROUP_MNEMONIC);
+            putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
             updateEnabledState();
         }