Index: applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
===================================================================
--- applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java	(revision 11952)
+++ applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java	(revision 11974)
@@ -33,5 +33,5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 import org.xml.sax.SAXException;
@@ -56,6 +56,6 @@
   public LakewalkerAction(String name) {
     super(name, "lakewalker-sml", tr("Lake Walker."),
-    ShortCut.registerShortCut("tools:lakewalker", tr("Tool: {0}", tr("Lake Walker")),
-    KeyEvent.VK_L, ShortCut.GROUP_EDIT, ShortCut.SHIFT_DEFAULT), true);
+    Shortcut.registerShortcut("tools:lakewalker", tr("Tool: {0}", tr("Lake Walker")),
+    KeyEvent.VK_L, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     this.name = name;
     setEnabled(true);
Index: applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java
===================================================================
--- applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java	(revision 11952)
+++ applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java	(revision 11974)
@@ -19,5 +19,5 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -39,11 +39,11 @@
      * @param iconName
      * @param tooltip
-     * @param shortCut
+     * @param shortcut
      * @param preferredHeight
      */
     public LiveGpsDialog(final MapFrame mapFrame) {
         super(tr("Live GPS"), "livegps", tr("Show GPS data."),
-        ShortCut.registerShortCut("subwindow:livegps", tr("Toggle: {0}", tr("Live GPS")),
-        KeyEvent.VK_G, ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 100);
+        Shortcut.registerShortcut("subwindow:livegps", tr("Toggle: {0}", tr("Live GPS")),
+        KeyEvent.VK_G, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 100);
         panel = new JPanel();
         panel.setLayout(new GridLayout(6,2));
Index: applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java
===================================================================
--- applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 11952)
+++ applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 11974)
@@ -20,5 +20,5 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 public class LiveGpsPlugin extends Plugin
@@ -40,6 +40,6 @@
         public CaptureAction() {
             super(tr("Capture GPS Track"), "capturemenu", tr("Connect to gpsd server and show current position in LiveGPS layer."),
-                ShortCut.registerShortCut("menu:livegps:capture", tr("Menu: {0}", tr("Capture GPS Track")),
-                KeyEvent.VK_R, ShortCut.GROUP_MENU), true);
+                Shortcut.registerShortcut("menu:livegps:capture", tr("Menu: {0}", tr("Capture GPS Track")),
+                KeyEvent.VK_R, Shortcut.GROUP_MENU), true);
         }
 
@@ -52,6 +52,6 @@
         public CenterAction() {
             super(tr("Center Once"), "centermenu", tr("Center the LiveGPS layer to current position."),
-            ShortCut.registerShortCut("edit:centergps", tr("Edit: {0}", tr("Center Once")),
-            KeyEvent.VK_HOME, ShortCut.GROUP_EDIT), true);
+            Shortcut.registerShortcut("edit:centergps", tr("Edit: {0}", tr("Center Once")),
+            KeyEvent.VK_HOME, Shortcut.GROUP_EDIT), true);
         }
 
@@ -66,6 +66,6 @@
         public AutoCenterAction() {
             super(tr("Auto-Center"), "autocentermenu", tr("Continuously center the LiveGPS layer to current position."),
-            ShortCut.registerShortCut("menu:livegps:autocenter", tr("Menu: {0}", tr("Capture GPS Track")),
-            KeyEvent.VK_HOME, ShortCut.GROUP_MENU), true);
+            Shortcut.registerShortcut("menu:livegps:autocenter", tr("Menu: {0}", tr("Capture GPS Track")),
+            KeyEvent.VK_HOME, Shortcut.GROUP_MENU), true);
         }
 
@@ -87,15 +87,15 @@
         lgpscapture = new JCheckBoxMenuItem(captureAction);
         lgpsmenu.add(lgpscapture);
-        lgpscapture.setAccelerator(captureAction.getShortCut().getKeyStroke());
+        lgpscapture.setAccelerator(captureAction.getShortcut().getKeyStroke());
 
         JosmAction centerAction = new CenterAction();
         JMenuItem centerMenu = new JMenuItem(centerAction);
         lgpsmenu.add(centerMenu);
-        centerMenu.setAccelerator(centerAction.getShortCut().getKeyStroke());
+        centerMenu.setAccelerator(centerAction.getShortcut().getKeyStroke());
 
         JosmAction autoCenterAction = new AutoCenterAction();
         lgpsautocenter = new JCheckBoxMenuItem(autoCenterAction);
         lgpsmenu.add(lgpsautocenter);
-        lgpsautocenter.setAccelerator(autoCenterAction.getShortCut().getKeyStroke());
+        lgpsautocenter.setAccelerator(autoCenterAction.getShortcut().getKeyStroke());
     }
 
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 11952)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 11974)
@@ -73,5 +73,5 @@
 import org.openstreetmap.josm.plugins.osb.gui.action.PopupFactory;
 import org.openstreetmap.josm.plugins.osb.i18n.Messages;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 public class OsbDialog extends ToggleDialog implements OsbObserver, ListSelectionListener, LayerChangeListener,
@@ -91,8 +91,8 @@
 		super("OpenStreetBugs", "icon_error22", 
 				Messages.translate(OsbDialog.class, "tooltip"), 
-				ShortCut.registerShortCut(
+				Shortcut.registerShortcut(
 						Messages.translate(OsbDialog.class, "shortcut"), 
 						Messages.translate(OsbDialog.class, "shortcut"), 
-						KeyEvent.VK_O, ShortCut.GROUP_MENU), 
+						KeyEvent.VK_O, Shortcut.GROUP_MENU), 
 				150);
 		
Index: applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisiblePlugin.java
===================================================================
--- applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisiblePlugin.java	(revision 11952)
+++ applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisiblePlugin.java	(revision 11974)
@@ -26,5 +26,5 @@
         
         fileMenu.add(menuItem,2);
-        menuItem.setAccelerator(openVisible.shortCut);
+        menuItem.setAccelerator(openVisible.shortcut);
     }
 
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java	(revision 11952)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java	(revision 11974)
@@ -86,5 +86,5 @@
         JCheckBoxMenuItem autoSaveMenu = new JCheckBoxMenuItem(autoSaveAction);
         gpsPlugin.getLgpsMenu().add(autoSaveMenu);  
-        autoSaveMenu.setAccelerator(autoSaveAction.shortCut);
+        autoSaveMenu.setAccelerator(autoSaveAction.shortcut);
     }
 
Index: applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java
===================================================================
--- applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java	(revision 11952)
+++ applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java	(revision 11974)
@@ -103,5 +103,5 @@
         JMenuItem actionItem = new JMenuItem(openAction);
         menu.insert(actionItem, 2);
-        actionItem.setAccelerator(openAction.shortCut);
+        actionItem.setAccelerator(openAction.shortcut);
         
     }
Index: applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/UtilsPlugin.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/UtilsPlugin.java	(revision 11952)
+++ applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/UtilsPlugin.java	(revision 11974)
@@ -28,5 +28,5 @@
 		action = new SimplifyWayAction();
 		SimplifyWay = Main.main.menu.toolsMenu.add(action);
-		SimplifyWay.setAccelerator(action.shortCut);
+		SimplifyWay.setAccelerator(action.shortcut);
 		SimplifyWay.setEnabled(false);
 	}
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 11952)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java	(revision 11974)
@@ -88,5 +88,4 @@
             WronglyOrderedWays.class, // ID 1001 .. 1099
             UnclosedWays.class, // ID 1101 .. 1199
-            TagChecker.class, // ID 1201 .. 1299
             UnconnectedWays.class, // ID 1301 .. 1399
     };
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java	(revision 11952)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java	(revision 11974)
@@ -14,5 +14,5 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.validator.util.AgregatePrimitivesVisitor;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -38,5 +38,5 @@
     public ValidateAction(OSMValidatorPlugin plugin) {
         super(tr("Validation"), "validator", tr("Performs the data validation"), 
-        ShortCut.registerShortCut("tools:validate", tr("Tool: {0}", tr("Validation")), KeyEvent.VK_V, ShortCut.GROUP_EDIT, ShortCut.SHIFT_DEFAULT), true);
+        Shortcut.registerShortcut("tools:validate", tr("Tool: {0}", tr("Validation")), KeyEvent.VK_V, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
         this.plugin = plugin;
     }
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java	(revision 11952)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java	(revision 11974)
@@ -36,5 +36,5 @@
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -72,6 +72,6 @@
     public ValidatorDialog(OSMValidatorPlugin plugin) {
         super(tr("Validation errors"), "validator", tr("Open the validation window."),
-        ShortCut.registerShortCut("subwindow:validator", tr("Toggle: {0}", tr("Validation errors")),
-        KeyEvent.VK_V, ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150);
+        Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation errors")),
+        KeyEvent.VK_V, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
 
         this.plugin = plugin;