Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java	(revision 27839)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java	(revision 27852)
@@ -27,5 +27,5 @@
               Shortcut.registerShortcut("address:resolveconflict",
                         "Adresy: Zobrazit konflikty",
-                        KeyEvent.VK_R, Shortcut.GROUP_NONE, Shortcut.SHIFT_DEFAULT),
+                        KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
               true);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java	(revision 27839)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java	(revision 27852)
@@ -40,5 +40,5 @@
               Shortcut.registerShortcut( "mapmode:clickaddress",
                   "Sputit továrnu na adresy",
-                  KeyEvent.VK_K, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT2),
+                  KeyEvent.VK_K, Shortcut.ALT_SHIFT),
               frame,
               ImageProvider.getCursor("crosshair", "envelope-star-small"));
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java	(revision 27839)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java	(revision 27852)
@@ -28,5 +28,5 @@
               Shortcut.registerShortcut("address:assignaddress",
                         "Adresy: Přiřadit adresy",
-                        KeyEvent.VK_P, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT),
+                        KeyEvent.VK_P, Shortcut.SHIFT),
               true);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java	(revision 27839)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java	(revision 27852)
@@ -30,5 +30,5 @@
                 Shortcut.registerShortcut("tools:newaddress",
                         "Adresy: Vytvořit/upravit adres",
-                        KeyEvent.VK_W, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1),
+                        KeyEvent.VK_W, Shortcut.ALT_CTRL_SHIFT),
                 true);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 27839)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 27852)
@@ -43,5 +43,5 @@
               Shortcut.registerShortcut("tools:splitarea",
                     tr("Tool: {0}", tr("Split area")),
-                    KeyEvent.VK_W, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT1),
+                    KeyEvent.VK_W, Shortcut.ALT_SHIFT),
               true);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 27839)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 27852)
@@ -62,5 +62,5 @@
                "Umožňuje rychlé vytváření adresních bodů „jedním kliknutím.“",
                 Shortcut.registerShortcut("subwindow:addressfactory","Přepnout: Továrna na adresy",
-                    KeyEvent.VK_T, Shortcut.GROUP_LAYER),
+                    KeyEvent.VK_T, Shortcut.ALT),
                 200);