Index: /trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 16967)
@@ -12,5 +12,5 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.List;
 import java.util.Locale;
@@ -251,5 +251,5 @@
     public final HistoryInfoWebAction historyinfoweb = new HistoryInfoWebAction();
     /** View / "Zoom to"... actions */
-    public final Map<String, AutoScaleAction> autoScaleActions = new HashMap<>();
+    public final Map<AutoScaleMode, AutoScaleAction> autoScaleActions = new EnumMap<>(AutoScaleMode.class);
     /** View / Jump to position */
     public final JumpToAction jumpToAct = new JumpToAction();
@@ -798,5 +798,5 @@
         for (AutoScaleMode mode : AutoScaleMode.values()) {
             AutoScaleAction autoScaleAction = new AutoScaleAction(mode);
-            autoScaleActions.put(mode.getEnglishLabel(), autoScaleAction);
+            autoScaleActions.put(mode, autoScaleAction);
             add(viewMenu, autoScaleAction);
         }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 16967)
@@ -38,4 +38,5 @@
 
 import org.openstreetmap.josm.actions.AbstractSelectAction;
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.command.Command;
@@ -141,5 +142,5 @@
         createLayout(lstConflicts, true, Arrays.asList(btnResolve, btnSelect));
 
-        popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get("conflict"));
+        popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get(AutoScaleAction.AutoScaleMode.CONFLICT));
 
         ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction();
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 16967)
@@ -140,5 +140,5 @@
         };
 
-        popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get("problem"));
+        popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get(AutoScaleAction.AutoScaleMode.PROBLEM));
         popupMenuHandler.addAction(new EditRelationAction());
         popupMenuHandler.addAction(ignoreForNowAction);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 16967)
@@ -74,4 +74,5 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.ImageryAdjustAction;
@@ -1752,4 +1753,5 @@
             LayerListDialog.getInstance().createActivateLayerAction(this),
             LayerListDialog.getInstance().createShowHideLayerAction(),
+            MainApplication.getMenu().autoScaleActions.get(AutoScaleAction.AutoScaleMode.LAYER),
             LayerListDialog.getInstance().createDeleteLayerAction(),
             SeparatorLayerAction.INSTANCE,
Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 16967)
@@ -25,4 +25,5 @@
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
@@ -265,4 +266,5 @@
                 LayerListDialog.getInstance().createShowHideLayerAction(),
                 LayerListDialog.getInstance().createDeleteLayerAction(),
+                MainApplication.getMenu().autoScaleActions.get(AutoScaleAction.AutoScaleMode.LAYER),
                 LayerListDialog.getInstance().createMergeLayerAction(this),
                 SeparatorLayerAction.INSTANCE,
Index: /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 16967)
@@ -16,8 +16,6 @@
 import java.io.IOException;
 import java.text.DateFormat;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
 import java.util.regex.Matcher;
@@ -35,4 +33,5 @@
 import javax.swing.text.View;
 
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.Bounds;
@@ -405,11 +404,12 @@
     @Override
     public Action[] getMenuEntries() {
-        List<Action> actions = new ArrayList<>();
-        actions.add(LayerListDialog.getInstance().createShowHideLayerAction());
-        actions.add(LayerListDialog.getInstance().createDeleteLayerAction());
-        actions.add(new LayerListPopup.InfoAction(this));
-        actions.add(new LayerSaveAction(this));
-        actions.add(new LayerSaveAsAction(this));
-        return actions.toArray(new Action[0]);
+        return new Action[]{
+                LayerListDialog.getInstance().createShowHideLayerAction(),
+                MainApplication.getMenu().autoScaleActions.get(AutoScaleAction.AutoScaleMode.LAYER),
+                LayerListDialog.getInstance().createDeleteLayerAction(),
+                new LayerListPopup.InfoAction(this),
+                new LayerSaveAction(this),
+                new LayerSaveAsAction(this),
+        };
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 16967)
@@ -50,4 +50,5 @@
 import javax.swing.JScrollPane;
 
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
@@ -720,8 +721,8 @@
     @Override
     public Action[] getMenuEntries() {
-        List<Action> actions = new ArrayList<>();
-        actions.addAll(Arrays.asList(
+        List<Action> actions = new ArrayList<>(Arrays.asList(
                 LayerListDialog.getInstance().createActivateLayerAction(this),
                 LayerListDialog.getInstance().createShowHideLayerAction(),
+                MainApplication.getMenu().autoScaleActions.get(AutoScaleAction.AutoScaleMode.LAYER),
                 LayerListDialog.getInstance().createDeleteLayerAction(),
                 SeparatorLayerAction.INSTANCE,
Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 16967)
@@ -82,6 +82,5 @@
     @Override
     public Action[] getMenuEntries() {
-        List<Action> ret = new ArrayList<>();
-        ret.addAll(Arrays.asList(super.getMenuEntries()));
+        List<Action> ret = new ArrayList<>(Arrays.asList(super.getMenuEntries()));
         ret.add(SeparatorLayerAction.INSTANCE);
         ret.add(new LayerSaveAction(this));
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 16967)
@@ -36,4 +36,5 @@
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.mapmode.SelectLassoAction;
@@ -401,4 +402,5 @@
         entries.add(LayerListDialog.getInstance().createShowHideLayerAction());
         entries.add(LayerListDialog.getInstance().createDeleteLayerAction());
+        entries.add(MainApplication.getMenu().autoScaleActions.get(AutoScaleAction.AutoScaleMode.LAYER));
         entries.add(LayerListDialog.getInstance().createMergeLayerAction(this));
         entries.add(new RenameLayerAction(null, this));
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 16966)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 16967)
@@ -30,4 +30,5 @@
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -247,4 +248,5 @@
         components.add(new ShowHideMarkerText(this));
         components.add(LayerListDialog.getInstance().createDeleteLayerAction());
+        components.add(MainApplication.getMenu().autoScaleActions.get(AutoScaleAction.AutoScaleMode.LAYER));
         components.add(LayerListDialog.getInstance().createMergeLayerAction(this));
         components.add(SeparatorLayerAction.INSTANCE);