Index: applications/editors/josm/i18n/convpreset.pl
===================================================================
--- applications/editors/josm/i18n/convpreset.pl	(revision 24763)
+++ applications/editors/josm/i18n/convpreset.pl	(revision 24764)
@@ -8,4 +8,7 @@
 my $item = "";
 my $group;
+my $combo_n;
+my @combo_values;
+my $combo_idx;
 my $comment = 0;
 
@@ -104,4 +107,6 @@
   {
     my ($n,$vals) = ($1,$2);
+    $combo_n = $n;
+    $combo_idx = 0;
     my $vctx = ($line =~ /values_context=(".*?")/) ? $1 : undef;
     if($line =~ /text_context=(".*?")/)
@@ -113,5 +118,29 @@
       print "/* item $item combo $n */ tr($n);";
     }
-    foreach my $val (split ",",$vals)
+    $vals =~ s/\\,/\x91/g;
+    @combo_values = split ",",$vals;
+    for (my $i=0; $i<@combo_values; ++$i) {
+      $combo_values[$i] =~ s/\x91/,/g;
+      next if $combo_values[$i] =~ /^[0-9-]+$/; # search for non-numbers
+      print $vctx ? " trc($vctx, \"$combo_values[$i]\");" : " tr(\"$combo_values[$i]\");";
+    }
+    print "\n";
+  }
+  elsif($line =~ /<combo.*\s+text=(".*?").*\s+values="(.*?)"/)
+  {
+    my ($n,$vals) = ($1,$2);
+    $combo_n = $n;
+    $combo_idx = 0;
+    my $vctx = ($line =~ /values_context=(".*?")/) ? $1 : undef;
+    if($line =~ /text_context=(".*?")/)
+    {
+      print "/* item $item combo $n */ trc($1,$n);";
+    }
+    else
+    {
+      print "/* item $item combo $n */ tr($n);";
+    }
+    @combo_values = split ",",$vals;
+    foreach my $val (@combo_values)
     {
       next if $val =~ /^[0-9-]+$/; # search for non-numbers
@@ -120,22 +149,9 @@
     print "\n";
   }
-  elsif($line =~ /<combo.*\s+text=(".*?").*\s+values="(.*?)"/)
-  {
-    my ($n,$vals) = ($1,$2);
-    my $vctx = ($line =~ /values_context=(".*?")/) ? $1 : undef;
-    if($line =~ /text_context=(".*?")/)
-    {
-      print "/* item $item combo $n */ trc($1,$n);";
-    }
-    else
-    {
-      print "/* item $item combo $n */ tr($n);";
-    }
-    foreach my $val (split ",",$vals)
-    {
-      next if $val =~ /^[0-9-]+$/; # search for non-numbers
-      print $vctx ? " trc($vctx, \"$val\");" : " tr(\"$val\");";
-    }
-    print "\n";
+  elsif($line =~ /<short_description>(.*?)<\/short_description>/)
+  {
+    my $n = $1;
+    print "/* item $item combo $combo_n item \"$combo_values[$combo_idx]\" short description */ tr(\"$n\");\n";
+    $combo_idx++;
   }
   elsif($line =~ /<\/group>/)
@@ -148,4 +164,9 @@
     $item = "";
     print "\n";
+  }
+  elsif($line =~ /<\/combo/)
+  {
+    $combo_n = "";
+    $combo_idx = 0;
   }
   elsif(!$line)