*** Lang v2 cleanup (FS#6574) ***

1) Introduces apps/features.txt that controls which strings are included 
for each target based on defines.
2) .lng and .voice files are now target specific and the format versions 
of both these file types have been bumped, which means that new voice 
files are needed. 
3) Use the 'features' mechanism to exclude strings for targets that 
didn't use them.
4) Delete unused and deprecated and duplicated strings, sort strings in 
english.lang

Some string IDs were changed so translations will be slightly worse than 
before.



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

1 files changed, 10 insertions, 6 deletions

diff --git a/tools/genvoice.sh b/tools/genvoice.sh
index f32ab9476a..15028e3bd1 100755
--- a/tools/genvoice.sh
+++ b/tools/genvoice.sh
@@ -34,13 +34,17 @@ TTS_ENGINE=festival
 ENCODER=lame
 # Where to save temporary files
 TEMPDIR=/tmp
+# List of IDs to send to voicefont
+VOICEFONTIDS=voicefontids
 
 ###################
 # End of settings #
 ###################
 
+TARGET_ID="$4"
 createvoicefile() {
-    $VOICEFONT "$LANG_FILE" "$TEMPDIR/" "./$RLANG.voice"
+    $GENLANG -e=$ENGLISH -o -t=$TARGET $LANG_FILE > $VOICEFONTIDS
+    $VOICEFONT "$VOICEFONTIDS" "$TARGET_ID" "$TEMPDIR/" "./$RLANG.voice"
 }
 
 deletefiles() {
@@ -106,7 +110,7 @@ generateclips() {
 }
 
 if [ -z "$3" ]; then
-    echo "Usage: $0 rockboxdirectory language target [settingsfile]";
+    echo "Usage: $0 rockboxdirectory language target targetid [settingsfile]";
     exit 32
 else
     if [ ! -d "$1" ] || [ ! -f "$1/tools/genlang" ]; then
@@ -117,12 +121,12 @@ else
         echo "Error: $2 is not a valid language"
         exit 34
     fi
-    if [ ! -z "$4" ]; then
-        if [ -f "$4" ]; then
+    if [ ! -z "$5" ]; then
+        if [ -f "$5" ]; then
             # Read settings from file
-            source "$4"
+            source "$5"
         else
-            echo "Error: $4 does not exist"
+            echo "Error: $5 does not exist"
             exit 36
         fi
     fi