Index: trunk/src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java	(revision 15027)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadAlongWayAction.java	(revision 15028)
@@ -37,5 +37,5 @@
     public DownloadAlongWayAction() {
         super(tr("Download along..."), "download_along_way", tr("Download OSM data along the selected ways."),
-                Shortcut.registerShortcut("tools:download_along", tr("Tool: {0}", tr("Download Along")),
+                Shortcut.registerShortcut("file:download_along", tr("File: {0}", tr("Download Along")),
                         KeyEvent.VK_D, Shortcut.ALT_SHIFT), true);
     }
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 15027)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 15028)
@@ -677,4 +677,5 @@
         add(fileMenu, download);
         add(fileMenu, downloadInView, true);
+        add(fileMenu, downloadAlongWay);
         add(fileMenu, downloadPrimitive);
         add(fileMenu, searchNotes);
@@ -819,5 +820,4 @@
         add(toolsMenu, createMultipolygon);
         add(toolsMenu, updateMultipolygon);
-        add(toolsMenu, downloadAlongWay);
 
         // -- changeset manager toggle action