Index: /applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- /applications/editors/josm/plugins/livegps/build.xml	(revision 11933)
+++ /applications/editors/josm/plugins/livegps/build.xml	(revision 11934)
@@ -48,4 +48,5 @@
         <attribute name="Plugin-Description" value="${plugin.description}" />
         <attribute name="Plugin-Version" value="${plugin.version}" />
+        <attribute name="Plugin-Mainversion" value="1065" />
         <!--attribute name="Plugin-Dependencies" value="org.eigenheimstrasse.josm" /-->
         <attribute name="Plugin-Stage" value="${plugin.stage}" />
@@ -58,4 +59,5 @@
     <mkdir dir="${plugin.build.dir}"/>
     <javac srcdir="livegps" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+      <compilerarg value="-Xlint:deprecation"/>
       <classpath>
         <pathelement path="${josm.build.dir}/build"/>
Index: /applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java
===================================================================
--- /applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java	(revision 11933)
+++ /applications/editors/josm/plugins/livegps/livegps/LiveGpsDialog.java	(revision 11934)
@@ -19,4 +19,5 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.tools.ShortCut;
 
 /**
@@ -42,5 +43,7 @@
      */
     public LiveGpsDialog(final MapFrame mapFrame) {
-        super(tr("Live GPS"), "livegps", tr("Show GPS data."), KeyEvent.VK_G, 100);
+        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);
         panel = new JPanel();
         panel.setLayout(new GridLayout(6,2));
Index: /applications/editors/josm/plugins/livegps/livegps/LiveGpsLayer.java
===================================================================
--- /applications/editors/josm/plugins/livegps/livegps/LiveGpsLayer.java	(revision 11933)
+++ /applications/editors/josm/plugins/livegps/livegps/LiveGpsLayer.java	(revision 11934)
@@ -1,3 +1,5 @@
 package livegps;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -21,5 +23,5 @@
 
 public class LiveGpsLayer extends GpxLayer implements PropertyChangeListener {
-    public static final String LAYER_NAME = "LiveGPS layer";
+    public static final String LAYER_NAME = tr("LiveGPS layer");
     public static final String KEY_LIVEGPS_COLOR ="color.livegps.position";
 	LatLon lastPos;
@@ -112,15 +114,8 @@
 //	        g.fillRect(mvs.x, mvs.y, mvs.width, mvs.height);
 
-	        
 	        if (lastPoint != null)
 	        {
-	            String colorString = Main.pref.get(KEY_LIVEGPS_COLOR);
-	            if(colorString.length() == 0) {
-	                colorString = ColorHelper.color2html(Color.RED);
-	                Main.pref.put(KEY_LIVEGPS_COLOR, colorString);
-	            }
-	            Color color = ColorHelper.html2color(colorString);
 	            Point screen = mv.getPoint(lastPoint.eastNorth);
-	            g.setColor(color);
+	            g.setColor(Main.pref.getColor(KEY_LIVEGPS_COLOR, Color.RED));
 	            g.drawOval(screen.x-10, screen.y-10,20,20);
 	            g.drawOval(screen.x-9, screen.y-9,18,18);
Index: /applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java
===================================================================
--- /applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 11933)
+++ /applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 11934)
@@ -17,6 +17,8 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.tools.ShortCut;
 
 public class LiveGpsPlugin extends Plugin
@@ -37,5 +39,7 @@
     public class CaptureAction extends JosmAction {
         public CaptureAction() {
-            super(tr("Capture GPS Track"), "capturemenu", tr("Connect to gpsd server and show current position in LiveGPS layer."), KeyEvent.VK_R, KeyEvent.ALT_MASK, true);
+            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);
         }
 
@@ -47,5 +51,7 @@
     public class CenterAction extends JosmAction {
         public CenterAction() {
-            super(tr("Center Once"), "centermenu", tr("Center the LiveGPS layer to current position."), KeyEvent.VK_C, 0, true);
+            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);
         }
 
@@ -59,5 +65,7 @@
     public class AutoCenterAction extends JosmAction {
         public AutoCenterAction() {
-            super(tr("Auto-Center"), "autocentermenu", tr("Continuously center the LiveGPS layer to current position."), KeyEvent.VK_HOME, 0, true);
+            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);
         }
 
@@ -70,26 +78,26 @@
 
     public LiveGpsPlugin() 
-    {        
-        JMenuBar menu = Main.main.menu;
-        lgpsmenu = new JMenu("LiveGPS");
-        lgpsmenu.setMnemonic(KeyEvent.VK_G);
+    {
+        MainMenu menu = Main.main.menu;
+        lgpsmenu = new JMenu(tr("LiveGPS"));
+        menu.add(lgpsmenu, KeyEvent.VK_G, "livegps");
         menu.add(lgpsmenu, 5);
-        
+
         JosmAction captureAction = new CaptureAction();
         lgpscapture = new JCheckBoxMenuItem(captureAction);
-        lgpsmenu.add(lgpscapture);  
-        lgpscapture.setAccelerator(captureAction.shortCut);
+        lgpsmenu.add(lgpscapture);
+        lgpscapture.setAccelerator(captureAction.getShortCut().getKeyStroke());
 
         JosmAction centerAction = new CenterAction();
         JMenuItem centerMenu = new JMenuItem(centerAction);
-        lgpsmenu.add(centerMenu);  
-        centerMenu.setAccelerator(centerAction.shortCut);
+        lgpsmenu.add(centerMenu);
+        centerMenu.setAccelerator(centerAction.getShortCut().getKeyStroke());
 
         JosmAction autoCenterAction = new AutoCenterAction();
         lgpsautocenter = new JCheckBoxMenuItem(autoCenterAction);
-        lgpsmenu.add(lgpsautocenter);  
-        lgpsautocenter.setAccelerator(autoCenterAction.shortCut);
+        lgpsmenu.add(lgpsautocenter);
+        lgpsautocenter.setAccelerator(autoCenterAction.getShortCut().getKeyStroke());
     }
-    
+
     /**
      * Set to <code>true</code> if the current position should always be in the center of the map.