Index: applications/editors/josm/i18n/build.xml
===================================================================
--- applications/editors/josm/i18n/build.xml	(revision 35344)
+++ applications/editors/josm/i18n/build.xml	(revision 35345)
@@ -3,5 +3,5 @@
     <!-- compilation properties -->
     <property name="josm.build.dir" value="../core"/>
-    <property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/>
+    <property name="josm.presets" value="${josm.build.dir}/resources/data/defaultpresets.xml"/>
     <property name="plugin.dir" value="../plugins"/>
     <property name="maps.srcfile" value="https://josm.openstreetmap.de/maps"/>
@@ -9,6 +9,6 @@
     <property name="surveyor.srcfile" value="${plugin.dir}/surveyor/resources/surveyor.xml"/>
     <property name="i18n.build.dir" value="build"/>
-    <property name="i18n.install.dir" value="${josm.build.dir}/data"/>
-    <property name="pluginlist.install.dir" value="${josm.build.dir}/data_nodist/trans"/>
+    <property name="i18n.install.dir" value="${josm.build.dir}/resources/data"/>
+    <property name="pluginlist.install.dir" value="${josm.build.dir}/nodist/data/trans"/>
     <property name="po.build.dir" value="${i18n.build.dir}"/>
     <property name="ant.build.javac.target" value="1.5"/>
@@ -70,6 +70,6 @@
             <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
             <fileset dir="${i18n.build.dir}" includes="trans_presets.java"/>
-            <fileset dir="${josm.build.dir}/data/validator" includes="*.mapcss"/>
-            <fileset dir="${josm.build.dir}/styles/standard" includes="*.mapcss"/>
+            <fileset dir="${josm.build.dir}/resources/data/validator" includes="*.mapcss"/>
+            <fileset dir="${josm.build.dir}/resources/styles/standard" includes="*.mapcss"/>
             <fileset dir="${i18n.build.dir}" includes="trans_maps.java"/>
             <!-- data.pot -->
@@ -90,6 +90,6 @@
             <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
             <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
-            <fileset dir="${josm.build.dir}/data/validator" includes="*.mapcss"/>
-            <fileset dir="${josm.build.dir}/styles/standard" includes="*.mapcss"/>
+            <fileset dir="${josm.build.dir}/resources/data/validator" includes="*.mapcss"/>
+            <fileset dir="${josm.build.dir}/resources/styles/standard" includes="*.mapcss"/>
         </gettext-extract>
     </target>