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 5428)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java	(revision 5429)
@@ -4,4 +4,6 @@
  */
 package at.dallermassl.josm.plugin.surveyor;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -13,6 +15,8 @@
 import javax.swing.AbstractAction;
 import javax.swing.AbstractButton;
+import java.awt.event.KeyEvent;
 
 import at.dallermassl.josm.plugin.surveyor.action.SetWaypointAction;
+import org.openstreetmap.josm.actions.JosmAction;
 
 import livegps.LiveGpsLayer;
@@ -22,5 +26,5 @@
  *
  */
-public class AutoSaveAction extends AbstractAction {
+public class AutoSaveAction extends JosmAction {
     private static final long serialVersionUID = -8608679323231116043L;
     private static final long AUTO_SAVE_PERIOD_SEC = 60; // once a minute
@@ -31,6 +35,6 @@
     
     
-    public AutoSaveAction(String name) {
-        super(name);
+    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
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 5428)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java	(revision 5429)
@@ -15,4 +15,5 @@
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
+import java.awt.event.KeyEvent;
 
 import livegps.LiveGpsPlugin;
@@ -75,15 +76,15 @@
             throw new IllegalStateException("SurveyorPlugin needs LiveGpsPlugin, but could not find it!");
         }
-        SurveyorShowAction surveyorAction = new SurveyorShowAction("Surveyor", gpsPlugin);
+        SurveyorShowAction surveyorAction = new SurveyorShowAction(gpsPlugin);
         JMenuItem surveyorMenuItem = new JMenuItem(surveyorAction);
-        surveyorAction.putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke("alt S"));
-//        surveyorMenuItem.addActionListener(new ActionListener() {
+        surveyorMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.VK_ALT));
+
         gpsPlugin.getLgpsMenu().addSeparator();
         gpsPlugin.getLgpsMenu().add(surveyorMenuItem);
         
-        AutoSaveAction autoSaveAction = new AutoSaveAction(tr("AutoSave LiveData"));
-        autoSaveAction.putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke("alt ctrl S"));
+        AutoSaveAction autoSaveAction = new AutoSaveAction();
         JCheckBoxMenuItem autoSaveMenu = new JCheckBoxMenuItem(autoSaveAction);
         gpsPlugin.getLgpsMenu().add(autoSaveMenu);  
+        autoSaveMenu.setAccelerator(autoSaveAction.shortCut);
     }
 
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 5428)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java	(revision 5429)
@@ -27,4 +27,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.XmlObjectParser;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.xml.sax.SAXException;
 
@@ -35,5 +36,5 @@
  *
  */
-public class SurveyorShowAction extends AbstractAction {
+public class SurveyorShowAction extends JosmAction {
     private static final long serialVersionUID = 2184570223633094734L;
     private static final String DEFAULT_SOURCE = "resource://surveyor.xml";
@@ -42,9 +43,5 @@
 
     public SurveyorShowAction(LiveGpsPlugin gpsPlugin) {
-        this(null, gpsPlugin);
-    }
-    
-    public SurveyorShowAction(String name, LiveGpsPlugin gpsPlugin) {
-        super(name);
+        super(tr("Surveyor ..."), "surveyormenu.png", tr("Open surveyor tool."), KeyEvent.VK_S, KeyEvent.CTRL_MASK, true);
         this.gpsPlugin = gpsPlugin;
     }
@@ -107,5 +104,6 @@
             surveyorFrame.pack();
             surveyorFrame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-            surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
+            //surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
+            surveyorFrame.setTitle(tr("Surveyor"));
             // <FIXXME date="28.04.2007" author="cdaller">
             // TODO get old pos of frame from properties