Index: /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml
===================================================================
--- /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 27649)
+++ /applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 27650)
@@ -96,8 +96,8 @@
                 <attribute name="Author" value="Oliver Raupach"/>
                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.housenumbertool.HouseNumberTaggingToolPlugin"/>
-                <attribute name="Plugin-Date" value="2012-01-19"/>
                 <attribute name="Plugin-Description" value="Simple tool to tag house numbers. Select house and press «Y»."/>
-                <attribute name="Plugin-Mainversion" value="4667"/>
+                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
             	<attribute name="Plugin-Icon" value="images/home-icon32.png"/>
             	<attribute name="Plugin-Link" value="http://josm.openstreetmap.de/wiki/Help/Plugin/HouseNumberTaggingTool"/>
Index: /applications/editors/josm/plugins/merge-overlap/build.xml
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/build.xml	(revision 27649)
+++ /applications/editors/josm/plugins/merge-overlap/build.xml	(revision 27650)
@@ -55,4 +55,5 @@
                 <attribute name="Plugin-Class" value="mergeoverlap.MergeOverlapPlugin"/>
                 <attribute name="Plugin-Description" value="Merge overlapping part of ways."/>
+                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Icon" value="images/merge_overlap.png"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
Index: /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 27649)
+++ /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 27650)
@@ -52,6 +52,6 @@
 
 	public MergeOverlapAction() {
-		super(tr("Merge overlap", null), "merge_overlap", tr(
-				"Merge overlap of ways.", null), 
+		super(tr("Merge overlap"), "merge_overlap",
+				tr("Merge overlap of ways."), 
 				Shortcut.registerShortcut("tools:mergeoverlap",tr("Tool: {0}", tr("Merge overlap")), KeyEvent.VK_O,
 				Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT)
@@ -241,5 +241,5 @@
 		// Commit
 		Main.main.undoRedo.add(new SequenceCommand(
-				tr("Merge Overlap (combine)", null), cmds));
+				tr("Merge Overlap (combine)"), cmds));
 		getCurrentDataSet().setSelected(sel);
 		Main.map.repaint();
@@ -477,16 +477,16 @@
 					.showMessageDialog(
 							Main.parent,
-							tr("<html>A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>", null),
-							tr("Warning", null), JOptionPane.WARNING_MESSAGE);
+							tr("<html>A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"),
+							tr("Warning"), JOptionPane.WARNING_MESSAGE);
 		} else if (warnme) {
 			JOptionPane
 					.showMessageDialog(
 							Main.parent,
-							tr("<html>A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>", null),
-							tr("Warning", null), JOptionPane.WARNING_MESSAGE);
+							tr("<html>A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"),
+							tr("Warning"), JOptionPane.WARNING_MESSAGE);
 		}
 
 		return new SplitWayResult(
-				new SequenceCommand("Split way", commandList), null,
+				new SequenceCommand(tr("Split way"), commandList), null,
 				changedWay, newWays);
 	}
