Index: applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/build.xml	(revision 12485)
+++ applications/editors/josm/plugins/surveyor/build.xml	(revision 12486)
@@ -64,4 +64,6 @@
     </copy>
     <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
+      <compilerarg value="-Xlint:deprecation"/>
+      <compilerarg value="-Xlint:unchecked"/>
       <classpath>
 	<pathelement path="${josm.build.dir}/build"/>
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java	(revision 12485)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java	(revision 12486)
@@ -19,4 +19,5 @@
 import at.dallermassl.josm.plugin.surveyor.action.SetWaypointAction;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.tools.Shortcut;
 
 import livegps.LiveGpsLayer;
@@ -33,11 +34,9 @@
     private boolean autoSave = false;
     private Timer gpsDataTimer;
-    
-    
+
     public AutoSaveAction() {
-		super(tr("AutoSave LiveData"), "autosave.png", tr("Save captured data to file every minute."), KeyEvent.VK_S, KeyEvent.CTRL_MASK | KeyEvent.ALT_MASK, true);
-        // <FIXXME date="23.06.2007" author="cdaller">
-        // TODO set accelerator key
-        // </FIXXME> 
+        super(tr("AutoSave LiveData"), "autosave.png", tr("Save captured data to file every minute."),
+        Shortcut.registerShortcut("surveyor:autosave", tr("Tool: {0}", tr("AutoSave LiveData")),
+        KeyEvent.VK_S, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     }
 
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 12485)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 12486)
@@ -49,5 +49,5 @@
         hotKeys = new HashSet<String>();
         setLayout(new BorderLayout());
-        streetLabel = new JLabel("Way: ");
+        streetLabel = new JLabel(tr("Way: "));
         float fontSize = Float.parseFloat(Main.pref.get(SurveyorPlugin.PREF_KEY_STREET_NAME_FONT_SIZE, "35"));
         Main.pref.put(SurveyorPlugin.PREF_KEY_STREET_NAME_FONT_SIZE, String.valueOf(fontSize));
@@ -177,5 +177,5 @@
         if("gpsdata".equals(evt.getPropertyName())) {
             gpsData = (LiveGpsData) evt.getNewValue();
-            streetLabel.setText("Way: " + gpsData.getWayInfo());
+            streetLabel.setText(tr("Way: ") + gpsData.getWayInfo());
         }
         
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 12485)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java	(revision 12486)
@@ -12,4 +12,5 @@
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JFrame;
+import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -20,4 +21,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.PluginProxy;
 
@@ -73,18 +75,15 @@
             }
         }
-        if(gpsPlugin == null) {
-            throw new IllegalStateException("SurveyorPlugin needs LiveGpsPlugin, but could not find it!");
-        }
-        SurveyorShowAction surveyorAction = new SurveyorShowAction(gpsPlugin);
-        JMenuItem surveyorMenuItem = new JMenuItem(surveyorAction);
-        surveyorMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.VK_ALT));
+        if(gpsPlugin == null)
+            throw new IllegalStateException(tr("SurveyorPlugin needs LiveGpsPlugin, but could not find it!"));
 
-        gpsPlugin.getLgpsMenu().addSeparator();
-        gpsPlugin.getLgpsMenu().add(surveyorMenuItem);
-        
+        JMenu m = gpsPlugin.getLgpsMenu();
+        m.addSeparator();
+        MainMenu.add(m, new SurveyorShowAction(gpsPlugin));
+
         AutoSaveAction autoSaveAction = new AutoSaveAction();
         JCheckBoxMenuItem autoSaveMenu = new JCheckBoxMenuItem(autoSaveAction);
-        gpsPlugin.getLgpsMenu().add(autoSaveMenu);  
-        autoSaveMenu.setAccelerator(autoSaveAction.shortcut);
+        m.add(autoSaveMenu);
+        autoSaveMenu.setAccelerator(autoSaveAction.getShortcut().getKeyStroke());
     }
 
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java	(revision 12485)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java	(revision 12486)
@@ -26,4 +26,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -43,5 +44,7 @@
 
     public SurveyorShowAction(LiveGpsPlugin gpsPlugin) {
-        super(tr("Surveyor ..."), "surveyormenu.png", tr("Open surveyor tool."), KeyEvent.VK_S, KeyEvent.CTRL_MASK, true);
+        super(tr("Surveyor ..."), "surveyormenu.png", tr("Open surveyor tool."),
+        Shortcut.registerShortcut("surveyor:open", tr("Tool: {0}", tr("Surveyor ...")),
+        KeyEvent.VK_R, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
         this.gpsPlugin = gpsPlugin;
     }