Index: applications/editors/josm/plugins/build-common.xml
===================================================================
--- applications/editors/josm/plugins/build-common.xml	(revision 28289)
+++ applications/editors/josm/plugins/build-common.xml	(revision 28290)
@@ -36,5 +36,5 @@
     -->
     <target name="compile" depends="init">
-        <echo message="compiling sources for  ${plugin.jar} ... "/>
+        <echo message="compiling sources for ${plugin.jar} ..."/>
         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
Index: applications/editors/josm/plugins/build.xml
===================================================================
--- applications/editors/josm/plugins/build.xml	(revision 28289)
+++ applications/editors/josm/plugins/build.xml	(revision 28290)
@@ -15,5 +15,4 @@
         <ant antfile="build.xml" target="dist" dir="colorscheme"/>
         <ant antfile="build.xml" target="dist" dir="utilsplugin2"/>	
-        <ant antfile="build.xml" target="dist" dir="conflation"/> <!-- Depends on utilsplugin2 -->
         <ant antfile="build.xml" target="dist" dir="canvec_helper"/>
         <ant antfile="build.xml" target="dist" dir="ColumbusCSV"/>
@@ -43,4 +42,5 @@
         <ant antfile="build.xml" target="dist" dir="infomode"/>
         <ant antfile="build.xml" target="dist" dir="irsrectify"/>
+        <ant antfile="build.xml" target="dist" dir="jts"/>
         <ant antfile="build.xml" target="dist" dir="junctionchecking"/>
         <ant antfile="build.xml" target="dist" dir="lakewalker"/>
@@ -94,4 +94,5 @@
         <ant antfile="build.xml" target="dist" dir="waypoint_search"/>
         <ant antfile="build.xml" target="dist" dir="wayselector"/>
+        <ant antfile="build.xml" target="dist" dir="wikipedia"/>
         <ant antfile="build.xml" target="dist" dir="wms-turbo-challenge2"/>
     </target>
@@ -108,5 +109,4 @@
         <ant antfile="build.xml" target="clean" dir="ColumbusCSV"/>
         <ant antfile="build.xml" target="clean" dir="CommandLine"/>
-        <ant antfile="build.xml" target="clean" dir="conflation"/>
         <ant antfile="build.xml" target="clean" dir="Create_grid_of_ways"/>
         <ant antfile="build.xml" target="clean" dir="czechaddress"/>
@@ -133,4 +133,5 @@
         <ant antfile="build.xml" target="clean" dir="infomode"/>
         <ant antfile="build.xml" target="clean" dir="irsrectify"/>
+        <ant antfile="build.xml" target="clean" dir="jts"/>
         <ant antfile="build.xml" target="clean" dir="junctionchecking"/>
         <ant antfile="build.xml" target="clean" dir="lakewalker"/>
@@ -186,4 +187,5 @@
         <ant antfile="build.xml" target="clean" dir="waypoint_search"/>
         <ant antfile="build.xml" target="clean" dir="wayselector"/>
+        <ant antfile="build.xml" target="clean" dir="wikipedia"/>
         <ant antfile="build.xml" target="clean" dir="wms-turbo-challenge2"/>
     </target>
Index: applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadAction.java
===================================================================
--- applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadAction.java	(revision 28289)
+++ applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadAction.java	(revision 28290)
@@ -41,5 +41,5 @@
 
     public MirroredDownloadAction() {
-        super(tr("Download from OSM mirror..."), null, tr("Download map data from the OSM server."),
+        super(tr("Download from OSM mirror..."), (String)null, tr("Download map data from the OSM server."),
                 Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_DOWN, Shortcut.ALT_SHIFT),
                 true, "mirroreddownload/download", true);
Index: applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java
===================================================================
--- applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java	(revision 28289)
+++ applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java	(revision 28290)
@@ -16,5 +16,5 @@
 
     public UrlSelectionAction() {
-        super(tr("Select OSM mirror URL"), null, tr("Select OSM mirror URL to download from."),
+        super(tr("Select OSM mirror URL"), (String)null, tr("Select OSM mirror URL to download from."),
                 null, true, "mirroreddownload/urlselection", true);
         putValue("help", ht("/Action/SelectUrl"));
Index: applications/editors/josm/plugins/native-password-manager/build.xml
===================================================================
--- applications/editors/josm/plugins/native-password-manager/build.xml	(revision 28289)
+++ applications/editors/josm/plugins/native-password-manager/build.xml	(revision 28290)
@@ -54,5 +54,5 @@
     -->
     <target name="compile" depends="init">
-        <echo message="compiling sources for  ${plugin.jar} ... "/>
+        <echo message="compiling sources for ${plugin.jar} ..."/>
         <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}">
             <compilerarg value="-Xlint:deprecation"/>
@@ -105,4 +105,3 @@
         </jar>
     </target>
-
 </project>
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java	(revision 28289)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java	(revision 28290)
@@ -563,5 +563,5 @@
 
         public EnterRoleAction() {
-            super(tr("Change role"), null, tr("Enter role for selected members"),
+            super(tr("Change role"), (String)null, tr("Enter role for selected members"),
                     Shortcut.registerShortcut("reltoolbox:changerole", tr("Relation Toolbox: {0}", tr("Enter role for selected members")),
                     KeyEvent.VK_R, Shortcut.ALT_CTRL), false, "relcontext/enterrole", true);