Index: /applications/editors/josm/i18n/convpreset.pl
===================================================================
--- /applications/editors/josm/i18n/convpreset.pl	(revision 23090)
+++ /applications/editors/josm/i18n/convpreset.pl	(revision 23091)
@@ -27,9 +27,9 @@
     if($line =~ /name_context=(".*?")/)
     {
-      print "trc($1, $val); /* item $item */\n";
+      print "/* item $item */ trc($1, $val);\n";
     }
     else
     {
-      print "tr($val); /* item $item */\n";
+      print "/* item $item */ tr($val);\n";
     }
   }
@@ -41,9 +41,9 @@
     if($line =~ /name_context=(".*?")/)
     {
-      print "trc($1,$gr); /* group $group */\n";
+      print "/* group $group */ trc($1,$gr);\n";
     }
     else
     {
-      print "tr($gr); /* group $group */\n";
+      print "/* group $group */ tr($gr);\n";
     }
   }
@@ -57,9 +57,9 @@
     if($line =~ /text_context=(".*?")/)
     {
-      print "trc($1,$text); /* item $item label $text */\n";
+      print "/* item $item label $text */ trc($1,$text);\n";
     }
     else
     {
-      print "tr($text); /* item $item label $text */\n";
+      print "/* item $item label $text */ tr($text);\n";
     }
   }
@@ -69,9 +69,9 @@
     if($line =~ /text_context=(".*?")/)
     {
-      print "trc($1,$n); /* item $item text $n */\n";
+      print "/* item $item text $n */ trc($1,$n);\n";
     }
     else
     {
-      print "tr($n); /* item $item text $n */\n";
+      print "/* item $item text $n */ tr($n);\n";
     }
   }
@@ -81,9 +81,9 @@
     if($line =~ /text_context=(".*?")/)
     {
-      print "trc($1,$n); /* item $item check $n */\n";
+      print "/* item $item check $n */ trc($1,$n);\n";
     }
     else
     {
-      print "tr($n); /* item $item check $n */\n";
+      print "/* item $item check $n */ tr($n);\n";
     }
   }
@@ -93,9 +93,9 @@
     if($line =~ /text_context=(".*?")/)
     {
-      print "trc($1,$n); /* item $item role $n */\n";
+      print "/* item $item role $n */ trc($1,$n);\n";
     }
     else
     {
-      print "tr($n); /* item $item role $n */\n";
+      print "/* item $item role $n */ tr($n);\n";
     }
   }
@@ -107,9 +107,9 @@
     if($line =~ /text_context=(".*?")/)
     {
-      print "trc($1,$n); /* item $item combo $n */";
+      print "/* item $item combo $n */ trc($1,$n);";
     }
     else
     {
-      print "tr($n); /* item $item combo $n */";
+      print "/* item $item combo $n */ tr($n);";
     }
     foreach my $val (split ",",$vals)
@@ -126,9 +126,9 @@
     if($line =~ /text_context=(".*?")/)
     {
-      print "trc($1,$n); /* item $item combo $n */";
+      print "/* item $item combo $n */ trc($1,$n);";
     }
     else
     {
-      print "tr($n); /* item $item combo $n */";
+      print "/* item $item combo $n */ tr($n);";
     }
     foreach my $val (split ",",$vals)
Index: /applications/editors/josm/i18n/convstyle.pl
===================================================================
--- /applications/editors/josm/i18n/convstyle.pl	(revision 23090)
+++ /applications/editors/josm/i18n/convstyle.pl	(revision 23091)
@@ -18,9 +18,9 @@
   if($line =~ /<rules\s+name=(".*?")/)
   {
-    print "tr($1); /* mappaint style named $1 */\n";
+    print "/* mappaint style named $1 */ tr($1);\n";
   }
   elsif($line =~ /colour="([^"]+)#/)
   {
-    print "tr(\"$1\"); /* color $1 */\n";
+    print "/* color $1 */ tr(\"$1\");\n";
   }
   else
Index: /applications/editors/josm/i18n/convsurveyor.pl
===================================================================
--- /applications/editors/josm/i18n/convsurveyor.pl	(revision 23090)
+++ /applications/editors/josm/i18n/convsurveyor.pl	(revision 23091)
@@ -21,5 +21,5 @@
   if($line =~ /^#(.*)$/)
   {
-    print "//$1\n";
+    print "/* $1 */\n";
   }
   elsif($line =~ /^$/)
@@ -29,5 +29,5 @@
   elsif($line =~ /<button label=\"(.*?)\"/)
   {
-    print "tr(\"$1\"); // $line\n";
+    print "/* $line*/ tr(\"$1\");\n";
   }
   else
Index: /applications/editors/josm/i18n/convvalidator.pl
===================================================================
--- /applications/editors/josm/i18n/convvalidator.pl	(revision 23090)
+++ /applications/editors/josm/i18n/convvalidator.pl	(revision 23091)
@@ -21,5 +21,5 @@
   if($line =~ /^#(.*)$/)
   {
-    print "//$1\n";
+    print "/* $1 */\n";
   }
   elsif($line =~ /^$/)
@@ -29,5 +29,5 @@
   elsif($line =~ /(.*) *# *(.*) *$/)
   {
-    print "tr(\"$2\"); // $1\n";
+    print "/* $1 */ tr(\"$2\");\n";
   }
   else
Index: /applications/editors/josm/i18n/convwms.pl
===================================================================
--- /applications/editors/josm/i18n/convwms.pl	(revision 23090)
+++ /applications/editors/josm/i18n/convwms.pl	(revision 23091)
@@ -21,5 +21,5 @@
   if($line =~ /^#(.*)$/)
   {
-    print "//$1\n";
+    print "/* $1 */\n";
   }
   elsif($line =~ /^$/)
@@ -29,5 +29,5 @@
   elsif($line =~ /^(.*?);(.*?);(.*)$/)
   {
-    print "tr(\"$2\"); // $3\n";
+    print "/* $3 */ tr(\"$2\");\n";
   }
   else