Index: /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 3754)
@@ -2,6 +2,6 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java	(revision 3754)
@@ -20,5 +20,5 @@
         super(trc("audio", "Back"), "audio-back", trc("audio", "Jump back."),
         Shortcut.registerShortcut("audio:back", tr("Audio: {0}", trc("audio", "Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true);
-        this.putValue("help", ht("Action/AudioBack"));
+        this.putValue("help", ht("/Action/AudioBack"));
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java	(revision 3754)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.actions.audio;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
@@ -14,4 +15,5 @@
         super(trc("audio", "Faster"), "audio-faster", trc("audio", "Faster Forward"),
         Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", trc("audio", "Faster")), KeyEvent.VK_F9, Shortcut.GROUP_DIRECT), true);
+        this.putValue("help", ht("/Action/AudioFaster"));
     }
 }
Index: /trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java	(revision 3754)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.actions.audio;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
@@ -14,4 +15,5 @@
         super(trc("audio", "Slower"), "audio-slower", trc("audio", "Slower Forward"),
         Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", trc("audio", "Slower")), KeyEvent.VK_F4, Shortcut.GROUP_DIRECT), true);
+        this.putValue("help", ht("/Action/AudioSlower"));
     }
 }
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 3754)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.actions.mapmode;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -110,5 +111,5 @@
                 mapFrame,
                 getCursor("normal", "rectangle", Cursor.DEFAULT_CURSOR));
-        putValue("help", "Action/Extrude/Extrude");
+        putValue("help", ht("/Action/Extrude/Extrude"));
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200);
         selectedColor = PaintColors.SELECTED.get();
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 3754)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.actions.mapmode;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -110,5 +111,5 @@
                 getCursor("normal", "selection", Cursor.DEFAULT_CURSOR));
         mv = mapFrame.mapView;
-        putValue("help", "Action/Move/Move");
+        putValue("help", ht("/Action/Move/Move"));
         selectionManager = new SelectionManager(this, false, mv);
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay", 200);
Index: /trunk/src/org/openstreetmap/josm/gui/MapScaler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapScaler.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/gui/MapScaler.java	(revision 3754)
@@ -3,4 +3,5 @@
 package org.openstreetmap.josm.gui;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 
@@ -46,5 +47,5 @@
 
     public String helpTopic() {
-        return "MapView/Scaler";
+        return ht("/MapView/Scaler");
     }
 }
Index: /trunk/src/org/openstreetmap/josm/gui/MapSlider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapSlider.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/gui/MapSlider.java	(revision 3754)
@@ -1,4 +1,6 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.gui;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.beans.PropertyChangeEvent;
@@ -64,5 +66,5 @@
 
     public String helpTopic() {
-        return "MapView/Slider";
+        return ht("/MapView/Slider");
     }
 }
Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 3754)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.gui;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -624,5 +625,5 @@
 
     public String helpTopic() {
-        return "Statusline";
+        return ht("/Statusline");
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3754)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.gui.dialogs;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -258,5 +259,5 @@
     @Override
     public String helpTopic() {
-        return "Dialogs/ConflictListDialog";
+        return ht("/Dialogs/ConflictListDialog");
     }
 
@@ -327,5 +328,5 @@
             putValue(SHORT_DESCRIPTION,  tr("Open a merge dialog of all selected items in the list above."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "conflict"));
-            putValue("help", "Dialogs/ConflictListDialog#ResolveAction");
+            putValue("help", ht("/Dialogs/ConflictListDialog#ResolveAction"));
         }
 
@@ -347,5 +348,5 @@
             putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
-            putValue("help", "Dialogs/ConflictListDialog#SelectAction");
+            putValue("help", ht("/Dialogs/ConflictListDialog#SelectAction"));
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java	(revision 3754)
@@ -179,5 +179,5 @@
                 spec,
                 spec[0],
-                ht("Concepts/Conflict")
+                ht("/Concepts/Conflict")
         );
         if (ret == 0) {
Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 3754)
@@ -1277,5 +1277,5 @@
         public CustomizeColor() {
             super(tr("Customize Color"), ImageProvider.get("colorchooser"));
-            putValue("help", ht("Action/LayerCustomizeColor"));
+            putValue("help", ht("/Action/LayerCustomizeColor"));
         }
 
@@ -1312,5 +1312,5 @@
         public MarkersFromNamedPoins() {
             super(tr("Markers From Named Points"), ImageProvider.get("addmarkers"));
-            putValue("help", ht("Action/MarkersFromNamedPoints"));
+            putValue("help", ht("/Action/MarkersFromNamedPoints"));
         }
 
@@ -1340,5 +1340,5 @@
         public ImportAudio() {
             super(tr("Import Audio"), ImageProvider.get("importaudio"));
-            putValue("help", ht("ImportAudio"));
+            putValue("help", ht("/ImportAudio"));
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 3754)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.gui.layer.markerlayer;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -377,5 +378,5 @@
             super(tr("Show Text/Icons"), ImageProvider.get("dialogs", "showhide"));
             putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the marker text and icons."));
-            putValue("help", "Action/ShowHideTextIcons");
+            putValue("help", ht("/Action/ShowHideTextIcons"));
             this.layer = layer;
         }
@@ -406,5 +407,5 @@
         public CustomizeColor() {
             super(tr("Customize Color"), ImageProvider.get("colorchooser"));
-            putValue("help", "Action/LayerCustomizeColor");
+            putValue("help", ht("/Action/LayerCustomizeColor"));
         }
 
@@ -441,5 +442,5 @@
         public SynchronizeAudio() {
             super(tr("Synchronize Audio"), ImageProvider.get("audio-sync"));
-            putValue("help", "Action/SynchronizeAudio");
+            putValue("help", ht("/Action/SynchronizeAudio"));
         }
 
@@ -478,5 +479,5 @@
         public MoveAudio() {
             super(tr("Make Audio Marker at Play Head"), ImageProvider.get("addmarkers"));
-            putValue("help", "Action/MakeAudioMarkerAtPlayHead");
+            putValue("help", ht("/Action/MakeAudioMarkerAtPlayHead"));
         }
 
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java	(revision 3753)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java	(revision 3754)
@@ -757,5 +757,5 @@
                     tr("Error"),
                     JOptionPane.ERROR_MESSAGE,
-                    ht("Preferences/Styles#FailedToLoadStyleSources")
+                    ht("/Preferences/Styles#FailedToLoadStyleSources")
             );
         }