When synching a lang file with the most recent english translation, we

suck in the english voice strings. Thus, languages without a specified voice
string for a given string where the english version has one, will get the
english voice string there.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4457 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 2 deletions

diff --git a/tools/uplang b/tools/uplang
index 41730fb3d3..4e581f600e 100755
--- a/tools/uplang
+++ b/tools/uplang
@@ -26,6 +26,7 @@ while(<ENG>) {
             # the last one for a single phrase
             $all{$set{'id'}, 'desc'}=$set{'desc'};
             $all{$set{'id'}, 'eng'}=$set{'eng'};
+            $all{$set{'id'}, 'voice'}=$set{'voice'};
 
             $ids{$set{'id'}}=1;
             undef %set;
@@ -58,20 +59,27 @@ while(<NEW>) {
 
             print "\nid: ".$set{'id'}."\n";
 
-
             if($set{'desc'} ne $all{$set{'id'}, 'desc'}) {
                 print "### Description changed! Previous description was:\n",
                 "### \"".$set{'desc'}."\"\n";
                 $set{'desc'} = $all{$set{'id'}, 'desc'};
             }
-
             print "desc: ".$set{'desc'}."\n";
+
             if($set{'eng'} ne $all{$set{'id'}, 'eng'}) {
                 print "### English phrase was changed! Previous translation was made on:\n",
                 "### ".$set{'eng'}."\n";
                 $set{'eng'} = $all{$set{'id'}, 'eng'};
             }
             print "eng: ".$set{'eng'}."\n";
+
+            if($set{'voice'} ne $all{$set{'id'}, 'voice'}) {
+                print "### Voice string was changed! Previous version was:\n",
+                "### ".$set{'voice'}."\n";
+                $set{'voice'} = $all{$set{'id'}, 'voice'};
+            }
+            print "voice: ".$set{'voice'}."\n";
+
             print "new: ".$set{'new'}."\n";
 
             $ids{$set{'id'}}=0;