Index: applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java
===================================================================
--- applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 3339)
+++ applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 3340)
@@ -1,4 +1,5 @@
 package livegps;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -40,5 +41,5 @@
         lgpsmenu.setMnemonic(KeyEvent.VK_G);
         menu.add(lgpsmenu, 2);
-        lgpscapture = new JCheckBoxMenuItem("Capture GPS Track");
+        lgpscapture = new JCheckBoxMenuItem(tr("Capture GPS Track"));
         lgpscapture.setSelected(false);
         lgpscapture.setAccelerator(KeyStroke.getKeyStroke("alt R"));
@@ -50,8 +51,10 @@
         lgpsmenu.add(lgpscapture);
 
-        lgpscenter = new JMenuItem("Center Once", KeyEvent.VK_C);
+        lgpscenter = new JMenuItem(tr("Center Once"), KeyEvent.VK_C);
         lgpscenter.addActionListener(new ActionListener() {
         	public void actionPerformed(ActionEvent ev) {
-        		lgpslayer.center();
+        	    if(lgpslayer != null) {
+        	        lgpslayer.center();
+        	    }
         	}
         });
@@ -59,13 +62,33 @@
         
         
-        lgpsautocenter = new JCheckBoxMenuItem("Auto-Center on current position");
-        lgpsautocenter.setSelected(false);
+        lgpsautocenter = new JCheckBoxMenuItem(tr("Auto-Center on current position"));
+        lgpsautocenter.setSelected(true);
+        lgpsautocenter.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0));
         lgpsautocenter.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent ev) {
-                lgpslayer.setAutoCenter(lgpsautocenter.isSelected());
-                if (lgpsautocenter.isSelected()) lgpslayer.center();
+                setAutoCenter(lgpsautocenter.isSelected());
             }
         });
         lgpsmenu.add(lgpsautocenter);        
+    }
+    
+    /**
+     * Set to <code>true</code> if the current position should always be in the center of the map.
+     * @param autoCenter if <code>true</code> the map is always centered.
+     */
+    public void setAutoCenter(boolean autoCenter) {
+        lgpsautocenter.setSelected(autoCenter); // just in case this method was not called from the menu
+        if(lgpslayer != null) {
+            lgpslayer.setAutoCenter(autoCenter);
+            if (autoCenter) lgpslayer.center();
+        }
+    }
+    
+    /**
+     * Returns <code>true</code> if autocenter is selected.
+     * @return <code>true</code> if autocenter is selected.
+     */
+    public boolean isAutoCenter() {
+        return lgpsautocenter.isSelected();
     }
     
@@ -87,4 +110,5 @@
                     lgpslayer = new LiveGpsLayer(data);
                     Main.main.addLayer(lgpslayer);
+                    lgpslayer.setAutoCenter(isAutoCenter());
                 }
                 // connect layer with acquirer: