Index: /applications/editors/josm/i18n/build.xml
===================================================================
--- /applications/editors/josm/i18n/build.xml	(revision 26246)
+++ /applications/editors/josm/i18n/build.xml	(revision 26247)
@@ -50,7 +50,7 @@
             <fileset dir="${plugin.dir}" includes="**/*.java"/>
         </gettext-extract>
-        <gettext-merge keysFile="josm.pot" poDirectory="po"/>
     </target>
     <target name="build" depends="po/josm.pot,init">
+        <gettext-merge keysFile="josm.pot" poDirectory="po"/>
         <antcall target="coretrans"/>
         <foreach param="path" target="plugintrans">
Index: /applications/editors/josm/i18n/convpreset.pl
===================================================================
--- /applications/editors/josm/i18n/convpreset.pl	(revision 26246)
+++ /applications/editors/josm/i18n/convpreset.pl	(revision 26247)
@@ -133,4 +133,5 @@
       my $val = $combo_values[$i];
       $val =~ s/\x91/$sp/g;
+      $combo_values[$i] = $val;
       next if $val =~ /^[0-9-]+$/; # search for non-numbers
       $val = fix($val);