Index: /applications/editors/josm/i18n/convpreset.pl
===================================================================
--- /applications/editors/josm/i18n/convpreset.pl	(revision 33840)
+++ /applications/editors/josm/i18n/convpreset.pl	(revision 33841)
@@ -38,4 +38,5 @@
   $r .= " chunk $chunk" if $chunk;
   $r .= " group $group" if $group;
+  $r .= " combo $combo_type $combo_n" if $combo_type;
   $r .= " $_[0]" if $_[0];
   return $r ? "/* $r */ " : "";
@@ -48,5 +49,5 @@
   chomp($line);
   print "tr(\"---DUMMY-MARKER---\"); ";
-  if($line =~ /<item\s+name=(".*?")/)
+  if($line =~ /<item\s+name=(".*?")/ || $line =~ /<item.* name=(".*?")/)
   {
     my $val = fix($1);
@@ -173,18 +174,18 @@
     my $vctxi = ($line =~ /value_context=(".*?")/) ? $1 : $vctx;
     my $value = ($line =~ /value=(".*?")/) ? $1 : undef;
-    if($line =~ /display_value=(".*?")/)
+    if($line =~ /[^.]display_value=(".*?")/)
     {
       my $val = fix($1);
-      print infoblock("$combo_type $combo_n entry $value display value") . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
+      print infoblock("entry $value display value") . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
     }
     else
     {
       my $val = fix($value);
-      print infoblock("$combo_type $combo_n entry $value display value") . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
+      print infoblock("entry $value display value") . ($vctxi ? " trc($vctxi, $val);" : " tr($val);");
     }
     if($line =~ /short_description=(".*?")/)
     {
       my $val = fix($1);
-      print infoblock("$combo_type $combo_n entry $value short description") . "tr($val);";
+      print infoblock("entry $value short description") . "tr($val);";
     }
     print "\n";
Index: /applications/editors/josm/i18n/convwiki.pl
===================================================================
--- /applications/editors/josm/i18n/convwiki.pl	(revision 33840)
+++ /applications/editors/josm/i18n/convwiki.pl	(revision 33841)
@@ -32,22 +32,22 @@
   if($name =~ /^(.*?)([^\/]+-preset\.xml)$/)
   {
-    system "mv $name $name.orig";
+    system "mv \"$name\" \"$name.orig\"";
     my ($path, $xmlname) = ($1, $2);
-    my $res = `xmllint --format --schema ../core/data/tagging-preset.xsd $name.orig --encode utf-8 --output $name 2>&1`;
+    my $res = `xmllint --format --schema ../core/data/tagging-preset.xsd \"$name.orig\" --encode utf-8 --output \"$name\" 2>&1`;
     print $res if $res !~ /\.orig validates/;
-    system "perl convpreset.pl $name >${path}trans_$xmlname";
+    system "perl convpreset.pl \"$name\" >\"${path}trans_$xmlname\"";
     unlink "$name.orig";
   }
   elsif($name =~ /^(.*?)([^\/]+-style\.xml$)/)
   {
-    system "perl convstyle.pl $name >${1}trans_$2";
+    system "perl convstyle.pl \"$name\" >${1}trans_$2";
   }
   elsif($name =~ /^(.*?)([^\/]+\.mapcss)$/)
   {
-    system "perl convcss.pl $name >${1}trans_$2";
+    system "perl convcss.pl \"$name\" >${1}trans_$2";
   }
   else
   {
-    die "Unknown file type $name.";
+    die "Unknown file type \"$name\".";
   }
   unlink $name;