Index: applications/editors/josm/i18n/convpreset.pl
===================================================================
--- applications/editors/josm/i18n/convpreset.pl	(revision 36401)
+++ applications/editors/josm/i18n/convpreset.pl	(revision 36402)
@@ -8,4 +8,5 @@
 my $item = "";
 my $chunk = "";
+my @group;
 my $group;
 my $combo_n;
@@ -35,7 +36,7 @@
 {
   my $r = "";
-  $r .= " item $item" if $item;
-  $r .= " chunk $chunk" if $chunk;
-  $r .= " group $group" if $group;
+  $r .= " item \"$item\"" if $item;
+  $r .= " chunk \"$chunk\"" if $chunk;
+  $r .= " group \"$group\"" if $group;
   $r .= " $combo_type $combo_n" if $combo_type;
   $r .= " $_[0]" if $_[0];
@@ -49,9 +50,8 @@
   chomp($line);
   print "tr(\"---DUMMY-MARKER---\"); ";
-  if($line =~ /<item\s+name=(".*?")/ || $line =~ /<item.* name=(".*?")/)
+  if($line =~ /<item\s+name="(.*?)"/ || $line =~ /<item.* name="(.*?)"/)
   {
     my $val = fix($1);
-    $item = $group ? "$group$val" : $val;
-    $item =~ s/""/\//;
+    $item = $val;
     if($line =~ /name_context=(".*?")/)
     {
@@ -63,14 +63,14 @@
     }
   }
-  elsif($line =~ /<chunk\s+id=(".*?")/)
+  elsif($line =~ /<chunk\s+id="(.*?)"/)
   {
     $chunk = fix($1);
     print "/* $line */\n";
   }
-  elsif($line =~ /<group.*\s+name=(".*?")/)
+  elsif($line =~ /<group.*\s+name="(.*?)"/)
   {
     my $gr = fix($1);
-    $group = $group ? "$group$gr" : $gr;
-    $group =~ s/\"\"/\//;
+    push(@group, $gr);
+    $group = join('/',@group);
     if($line =~ /name_context=(".*?")/)
     {
@@ -194,5 +194,6 @@
   elsif($line =~ /<\/group>/)
   {
-    $group = 0 if !($group =~ s/(.*\/).*?$//);
+    pop(@group);
+    $group = @group ? join('/',@group) : 0;
     print "\n";
   }
Index: applications/editors/josm/i18n/launchpad.pl
===================================================================
--- applications/editors/josm/i18n/launchpad.pl	(revision 36401)
+++ applications/editors/josm/i18n/launchpad.pl	(revision 36402)
@@ -17,8 +17,9 @@
 # list of supported languages
 my %lang = map {$_ => 1} (
-"ar", "ast", "bg", "be", "ca", "ca\@valencia", "cs", "cy", "da", "de", "el", "en_AU", "en_GB",
-"es", "et", "fa", "fi", "fr", "gl", "hu", "id", "is",
-"it", "ja", "ko", "km", "lt", "mr", "nb", "nl", "pl", "pt", "pt_BR", "ru", "sk",
-"sr\@latin", "sv", "tr", "uk", "zh_CN", "zh_TW"
+"ar", "ast", "bg", "be", "ca", "ca\@valencia", "cs", "cy", "da", "de",
+"el", "en_AU", "en_CA", "en_GB", "es", "et", "fa", "fi", "fr", "gl",
+"hu", "id", "is", "it", "ja", "ko", "km", "lt", "mr", "nb",
+"nl", "pl", "pt", "pt_BR", "ru", "sk", "sr\@latin", "sv", "tr", "uk",
+"zh_CN", "zh_TW"
 );