Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/DownloadWMSTask.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/DownloadWMSTask.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/DownloadWMSTask.java	(revision 8721)
@@ -20,5 +20,5 @@
 	
 	public DownloadWMSTask(WMSLayer wmsLayer, Bounds bounds, double pixelPerDegree) {
-		super(tr("Downloading " + wmsLayer.name));
+		super(tr("Downloading {0}", wmsLayer.name));
 
 		this.wmsLayer = wmsLayer;
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java	(revision 8721)
@@ -1,3 +1,5 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -16,5 +18,5 @@
 	public Help_WMSmenuAction() {
 		//super("Help / About");
-		super("help", "help", "Help  / About", 0, 0, false);
+		super(tr("help"), "help", tr("Help  / About"), 0, 0, false);
 		
 	}
@@ -23,5 +25,5 @@
 		//todo - put this into a txt file? 
 		  String helptext = 
-			"You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "  +
+			tr("You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "  +
 			"these will then show up in the WMS menu.\n\n"+
 			
@@ -42,6 +44,5 @@
 			"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +
 			" \n" +
-			"Note: Make sure the image is suitable, copyright-wise, if in doubt, don't use.\n"+
-			 "WMS Plugin version: "+ WMSPlugin.VERSION ;		
+			"Note: Make sure the image is suitable, copyright-wise, if in doubt, don't use.");
 		
 		JTextPane tp = new JTextPane();
@@ -51,5 +52,5 @@
 		  
 		  js.getViewport().add(tp);
-		  JFrame jf = new JFrame("WMS Plugin Help");
+		  JFrame jf = new JFrame(tr("WMS Plugin Help"));
 		  jf.getContentPane().add(js);
 		  jf.pack();
@@ -57,6 +58,4 @@
 		  jf.setVisible(true); 
 		  tp.setText(helptext);
-	
+	}
 }
-	
-}
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java	(revision 8721)
@@ -1,3 +1,5 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -16,9 +18,9 @@
 
 	public Map_Rectifier_WMSmenuAction() {
-		super("Rectified Image ...", "OLmarker", "Download Rectified Image from Metacarta's Map Rectifer WMS", 0, 0, false);
+		super(tr("Rectified Image ..."), "OLmarker", tr("Download Rectified Image from Metacarta's Map Rectifer WMS"), 0, 0, false);
 	}
 
 	public void actionPerformed(ActionEvent e) {
-		String newid = JOptionPane.showInputDialog(Main.parent, "Metacarta Map Rectifier image id");
+		String newid = JOptionPane.showInputDialog(Main.parent, tr("Metacarta Map Rectifier image id"));
 
 		if (newid != null && !newid.equals("")) {
@@ -27,5 +29,5 @@
 
 			DownloadWMSTask.download(WMSDownloadAction.getLayer(
-				new WMSInfo("rectifier id="+newid, newURL, -1)));
+				new WMSInfo(tr("rectifier id={0}",newid), newURL, -1)));
 		}
 	}
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java	(revision 8721)
@@ -24,6 +24,6 @@
 
 	public WMSAdjustAction(MapFrame mapFrame) {
-		super("landsatAdjust", "movelandsat", 
-						"Adjust the position of the WMS layer", mapFrame, 
+		super(tr("landsatAdjust"), "movelandsat", 
+						tr("Adjust the position of the WMS layer"), mapFrame, 
 						ImageProvider.getCursor("normal", "move"));
 	}
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java	(revision 8721)
@@ -1,3 +1,5 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -13,5 +15,5 @@
 	
 	public WMSDownloadAction(WMSInfo info) {
-		super(info.name, "wmsmenu", "Download WMS tile from "+info.name, 0, 0, false);
+		super(info.name, "wmsmenu", tr("Download WMS tile from {0}",info.name), 0, 0, false);
 		this.info = info;
 	}
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 8721)
@@ -1,3 +1,5 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.image.BufferedImage;
@@ -43,5 +45,5 @@
 		} catch (MalformedURLException e) {
 			throw (IOException) new IOException(
-				"WMSGrabber: Illegal url.").initCause(e);
+				tr("WMSGrabber: Illegal url.")).initCause(e);
 		}
 	}
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 8721)
@@ -51,5 +51,5 @@
 
 	public WMSLayer() {
-		this("Blank Layer", null);
+		this(tr("Blank Layer"), null);
 	}
 
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java	(revision 8721)
@@ -28,6 +28,4 @@
 public class WMSPlugin extends Plugin {
 
-	static String VERSION = "2.4";
-	
 	WMSLayer wmsLayer;
 	static JMenu wmsJMenu;
@@ -82,5 +80,5 @@
 		// if no (valid) prefs are set, initialize to a sensible default.
 		if (wmsList.isEmpty()) {
-			WMSInfo landsatInfo = new WMSInfo("Landsat", 
+			WMSInfo landsatInfo = new WMSInfo(tr("Landsat"),
 					"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&"+
 					"layers=global_mosaic&styles=&srs=EPSG:4326&"+
@@ -89,5 +87,5 @@
 			wmsList.add(landsatInfo);
 			
-			WMSInfo npeInfo = new WMSInfo("NPE Maps", 
+			WMSInfo npeInfo = new WMSInfo(tr("NPE Maps"),
 					"http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&", 2);
 			npeInfo.save();
@@ -114,5 +112,5 @@
 		wmsJMenu.addSeparator();
 		wmsJMenu.add(new JMenuItem(new 
-				JosmAction("Blank Layer", "blankmenu", "Open a blank WMS layer to load data from a file", 0, 0, false) {
+				JosmAction(tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), 0, 0, false) {
 			public void actionPerformed(ActionEvent ev) {
 				Main.main.addLayer(new WMSLayer());
Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java
===================================================================
--- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java	(revision 8700)
+++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java	(revision 8721)
@@ -36,5 +36,5 @@
 		JPanel p = gui.createPreferenceTab("wms", tr("WMS Plugin Preferences"), tr("Modify list of WMS servers displayed in the WMS plugin menu"));
 		
-		model = new DefaultTableModel(new String[]{"#", "Menu Name", "WMS URL"}, 0) {
+		model = new DefaultTableModel(new String[]{"#", tr("Menu Name"), tr("WMS URL")}, 0) {
 			@Override public boolean isCellEditable(int row, int column) {
 				return column != 0;
@@ -59,9 +59,9 @@
 			public void actionPerformed(ActionEvent e) {
 				JPanel p = new JPanel(new GridBagLayout());
-				p.add(new JLabel("Menu Name"), GBC.std().insets(0,0,5,0));
+				p.add(new JLabel(tr("Menu Name")), GBC.std().insets(0,0,5,0));
 				JTextField key = new JTextField(10);
 				JTextField value = new JTextField(10);
 				p.add(key, GBC.eop().insets(5,0,0,0).fill(GBC.HORIZONTAL));
-				p.add(new JLabel("WMS URL"), GBC.std().insets(0,0,5,0));
+				p.add(new JLabel(tr("WMS URL")), GBC.std().insets(0,0,5,0));
 				p.add(value, GBC.eol().insets(5,0,0,0).fill(GBC.HORIZONTAL));
 				int answer = JOptionPane.showConfirmDialog(gui, p, tr("Enter a menu name and WMS URL"), JOptionPane.OK_CANCEL_OPTION);
