Index: applications/editors/josm/i18n/.tx/config
===================================================================
--- applications/editors/josm/i18n/.tx/config	(revision 34688)
+++ applications/editors/josm/i18n/.tx/config	(revision 34689)
@@ -1,4 +1,5 @@
 [main]
 host = https://www.transifex.com
+lang_map = ca@valencia: ca-valencia
 
 [josm.core]
@@ -8,7 +9,19 @@
 type = PO
 
-[josm.data]
-file_filter = po/<lang>/data.po
-source_file = po/data.pot
+[josm.maplist]
+file_filter = po/<lang>/maplist.po
+source_file = po/maplist.pot
+source_lang = en
+type = PO
+
+[josm.pluginlist]
+file_filter = po/<lang>/pluginlist.po
+source_file = po/pluginlist.pot
+source_lang = en
+type = PO
+
+[josm.presets]
+file_filter = po/<lang>/presets.po
+source_file = po/presets.pot
 source_lang = en
 type = PO
Index: applications/editors/josm/i18n/build.xml
===================================================================
--- applications/editors/josm/i18n/build.xml	(revision 34688)
+++ applications/editors/josm/i18n/build.xml	(revision 34689)
@@ -85,12 +85,15 @@
         </gettext-extract>
     </target>
-    <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="trans_.java,init">
+    <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="init">
         <gettext-extract keysFile="core.pot" poDirectory="po" keywords="${gettext.keywords} --exclude-file=excludes.pot">
             <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
             <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"/>
-            <!-- maps should be in data instead, but that requires language file loading support in trac python code -->
+        </gettext-extract>
+    </target>
+    <target name="po/maplist.pot" description="Extracts message keys from plugin descriptions" depends="trans_.java,init">
+        <gettext-extract keysFile="maplist.pot" poDirectory="po" keywords="${gettext.keywords} --exclude-file=excludes.pot">
+            <!-- maps should be translated server-side, but that requires language file loading support in trac python code -->
             <fileset dir="${i18n.build.dir}" includes="trans_maps.java"/>
         </gettext-extract>
@@ -99,9 +102,13 @@
         <gettext-extract keysFile="pluginlist.pot" poDirectory="po" keywords="${gettext.keywords} --exclude-file=excludes.pot">
             <fileset dir="${i18n.build.dir}" includes="trans_plugins.java"/>
-            <!-- <fileset dir="${i18n.build.dir}/josmfiles" includes="trans_*.*"/> -->
-        </gettext-extract>
-    </target>
-    <target name="po/plugins.pot" description="Extracts message keys from the plugins source code (minus core and data strings)" depends="trans_.java,po/core.pot,init">
-        <gettext-extract keysFile="plugins.pot" poDirectory="po" keywords="${gettext.keywords} --exclude-file=excludes.pot --exclude-file=po/core.pot">
+        </gettext-extract>
+    </target>
+    <target name="po/presets.pot" description="Extracts message keys from presets (minus core)" depends="trans_.java,po/core.pot,init">
+        <gettext-extract keysFile="presets.pot" poDirectory="po" keywords="${gettext.keywords} --exclude-file=excludes.pot --exclude-file=po/core.pot">
+            <fileset dir="${i18n.build.dir}" includes="trans_presets.java"/>
+        </gettext-extract>
+    </target>
+    <target name="po/plugins.pot" description="Extracts message keys from the plugins source code (minus core)" depends="trans_.java,po/core.pot,po/presets.pot,init,filterpluginsources">
+        <gettext-extract keysFile="plugins.pot" poDirectory="po" keywords="${gettext.keywords} --exclude-file=excludes.pot --exclude-file=po/core.pot --exclude-file=po/presets.pot">
             <fileset dir="${plugin.dir}" includesfile="${po.build.dir}/pluginSrc.txt"/>
             <fileset dir="${i18n.build.dir}" includes="trans_surveyor.java"/>
@@ -191,5 +198,5 @@
     </target>
     <target name="pot" depends="po/josm.pot" />
-    <target name="allpot" depends="po/core.pot,po/pluginlist.pot,po/plugins.pot" />
+    <target name="allpot" depends="po/core.pot,po/maplist.pot,po/pluginlist.pot,po/presets.pot,po/plugins.pot" />
     <target name="update">
         <exec executable="perl" failonerror="true">