Index: /applications/editors/josm/i18n/build.xml
===================================================================
--- /applications/editors/josm/i18n/build.xml	(revision 31900)
+++ /applications/editors/josm/i18n/build.xml	(revision 31901)
@@ -42,5 +42,5 @@
     </target>
     <target name="po/josm.pot" description="Extracts message keys from the source code" depends="trans_.java,init">
-        <gettext-extract keysFile="josm.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
+        <gettext-extract keysFile="josm.raw.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
             <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
             <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
@@ -51,4 +51,8 @@
             <fileset dir="${plugin.dir}" includes="**/*.java"/>
         </gettext-extract>
+        <exec executable="msggrep" failonerror="true">
+            <arg line="--msgid --regexp='---DUMMY-MARKER---' --invert-match --output-file=po/josm.pot po/josm.raw.pot"/>
+        </exec>
+        <delete file="po/josm.raw.pot"/>
     </target>
     <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="trans_.java,init">
Index: /applications/editors/josm/i18n/convmaps.pl
===================================================================
--- /applications/editors/josm/i18n/convmaps.pl	(revision 31900)
+++ /applications/editors/josm/i18n/convmaps.pl	(revision 31901)
@@ -34,5 +34,5 @@
   $line =~ s/\r//g;
   chomp($line);
-  print "tr(\"\"); ";
+  print "tr(\"---DUMMY-MARKER---\"); ";
   if($line =~ /<name(?: +lang=['"]en['"])?>(.*)<\/name>/)
   {
Index: /applications/editors/josm/i18n/convpreset.pl
===================================================================
--- /applications/editors/josm/i18n/convpreset.pl	(revision 31900)
+++ /applications/editors/josm/i18n/convpreset.pl	(revision 31901)
@@ -36,5 +36,5 @@
   ++$linenr;
   chomp($line);
-  print "tr(\"\"); ";
+  print "tr(\"---DUMMY-MARKER---\"); ";
   if($line =~ /<item\s+name=(".*?")/)
   {
Index: /applications/editors/josm/i18n/convstyle.pl
===================================================================
--- /applications/editors/josm/i18n/convstyle.pl	(revision 31900)
+++ /applications/editors/josm/i18n/convstyle.pl	(revision 31901)
@@ -18,5 +18,5 @@
 {
   chomp($line);
-  print "tr(\"\"); ";
+  print "tr(\"---DUMMY-MARKER---\"); ";
   if($line =~ /<rules\s+name=(".*?")/)
   {
Index: /applications/editors/josm/i18n/convsurveyor.pl
===================================================================
--- /applications/editors/josm/i18n/convsurveyor.pl	(revision 31900)
+++ /applications/editors/josm/i18n/convsurveyor.pl	(revision 31901)
@@ -19,5 +19,5 @@
 {
   chomp($line);
-  print "tr(\"\"); ";
+  print "tr(\"---DUMMY-MARKER---\"); ";
   if($line =~ /^#(.*)$/)
   {