Index: applications/editors/josm/plugins/wmsplugin/build.xml
===================================================================
--- applications/editors/josm/plugins/wmsplugin/build.xml	(revision 17817)
+++ applications/editors/josm/plugins/wmsplugin/build.xml	(revision 18404)
@@ -18,5 +18,5 @@
 ** To build against the core in ../../core, create a correct manifest and deploy to
 ** SVN, run
-**    - set the property commit.message 
+**    - set the property commit.message
 **    - set the property josm.reference.release to lowest JOSM release number this
 **      plugin build is compatible with
@@ -32,6 +32,6 @@
     <property name="ant.build.javac.target" value="1.5"/>
 	<property name="commit.message"         value="fixing JOSM issue #3186" />
-	<property name="josm.reference.release" value="2196" />
-	
+	<property name="josm.reference.release" value="2323" />
+
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
@@ -85,5 +85,5 @@
         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
-	
+
 	<target name="core-info">
 	        <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
@@ -98,5 +98,5 @@
 		</target>
 
-		
+
 		<target name="commit-current">
 			<echo>Commiting the plugin source ...</echo>
@@ -106,8 +106,8 @@
 		                    <arg value="-m &quot;${commit.message}&quot;"/>
 		                    <arg value="."/>
-		    </exec>	    
+		    </exec>
 		</target>
 
-		
+
 		<target name="update-current">
 			<echo>Updating basedir ...</echo>
@@ -116,5 +116,5 @@
 		                    <arg value="up"/>
 		                    <arg value="."/>
-		    </exec>	    
+		    </exec>
 			<echo>Updating ${plugin.jar} ...</echo>
 		    <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
@@ -122,7 +122,7 @@
 		                    <arg value="up"/>
 		                    <arg value="${plugin.jar}"/>
-		    </exec>	    
+		    </exec>
 		</target>
-		
+
 		<target name="commit-dist">
 				<echo>Commiting ${plugin.jar} ...</echo>
@@ -132,7 +132,7 @@
 	                			<arg value="-m &quot;${commit.message}&quot;"/>
 			                    <arg value="${plugin.jar}"/>
-			    </exec>	    
+			    </exec>
 	   	</target>
-		
+
 		<target name="deploy" depends="core-info,commit-current,update-current,clean,dist,commit-dist">
 		</target>
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 17817)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 18404)
@@ -1,5 +1,5 @@
 package wmsplugin;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -51,8 +51,8 @@
     static int overlapEast = 14;
     static int overlapNorth = 4;
-    
+
     // remember state of menu item to restore on changed preferences
     static private boolean menuEnabled = false;
-    
+
     protected void initExporterAndImporter() {
     	ExtensionFileFilter.exporters.add(new WMSLayerExporter());
@@ -94,17 +94,17 @@
         TreeSet<String> keys = new TreeSet<String>(prefs.keySet());
 
-        // Here we load the settings for "overlap" checkbox and spinboxes. 
-         
-        try { 
-            doOverlap = Boolean.valueOf(prefs.get("wmsplugin.url.overlap"));             
-        } catch (Exception e) {} // If sth fails, we drop to default settings. 
- 
-        try { 
-            overlapEast = Integer.valueOf(prefs.get("wmsplugin.url.overlapEast"));             
-        } catch (Exception e) {} // If sth fails, we drop to default settings. 
- 
-        try { 
-            overlapNorth = Integer.valueOf(prefs.get("wmsplugin.url.overlapNorth"));             
-        } catch (Exception e) {} // If sth fails, we drop to default settings. 
+        // Here we load the settings for "overlap" checkbox and spinboxes.
+
+        try {
+            doOverlap = Boolean.valueOf(prefs.get("wmsplugin.url.overlap"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
+
+        try {
+            overlapEast = Integer.valueOf(prefs.get("wmsplugin.url.overlapEast"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
+
+        try {
+            overlapNorth = Integer.valueOf(prefs.get("wmsplugin.url.overlapNorth"));
+        } catch (Exception e) {} // If sth fails, we drop to default settings.
 
         // And then the names+urls of WMS servers
@@ -169,5 +169,5 @@
 
         if (wmsJMenu == null)
-            wmsJMenu = menu.addMenu(marktr("WMS"), KeyEvent.VK_W, menu.defaultMenuPos);
+            wmsJMenu = menu.addMenu(tr("WMS"), KeyEvent.VK_W, menu.defaultMenuPos, ht("/Plugin/WMS"));
         else
             wmsJMenu.removeAll();