1 files changed, 67 insertions, 74 deletions

diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 1c118a5959..2f2e904ab4 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -13,6 +13,7 @@ themes_url=http://www.rockbox-themes.org
 manual_url=http://download.rockbox.org/manual
 doom_url=http://download.rockbox.org/useful/rockdoom.zip
 voice_url=http://www.rockbox.org/voices/
+genlang_url=http://www.rockbox.org/genlang/
 
 [platforms]
 platform01=player
@@ -56,6 +57,7 @@ resolution=11x2x1
 manualname=
 brand=Archos
 voicename=player
+targetid=1
 
 [recorder]
 name="Jukebox Recorder 6 / 10 / 15 / 20"
@@ -68,6 +70,7 @@ resolution=112x64x1
 manualname=
 brand=Archos
 voicename=recorder
+targetid=2
 
 [recorder8mb]
 name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)"
@@ -80,6 +83,7 @@ resolution=112x64x1
 manualname=rockbox-recorder
 brand=Archos
 voicename=recorder
+targetid=2
 
 [recorderv2]
 name="Jukebox Recorder v2 (20GB)"
@@ -92,6 +96,7 @@ resolution=112x64x1
 manualname=
 brand=Archos
 voicename=recorderv2
+targetid=4
 
 [fmrecorder]
 name="Jukebox Recorder FM"
@@ -104,6 +109,7 @@ resolution=112x64x1
 manualname=
 brand=Archos
 voicename=fmrecorder
+targetid=3
 
 [fmrecorder8mb]
 name="Jukebox Recorder FM (with 8MiB memory)"
@@ -116,6 +122,7 @@ resolution=112x64x1
 manualname=rockbox-fmrecorder
 brand=Archos
 voicename=fmrecorder
+targetid=3
 
 [ondiosp]
 name="Ondio SP"
@@ -128,6 +135,7 @@ resolution=112x64x1
 manualname=
 brand=Archos
 voicename=ondiosp
+targetid=7
 
 [ondiofm]
 name="Ondio FM"
@@ -140,6 +148,7 @@ resolution=112x64x1
 manualname=
 brand=Archos
 voicename=ondiofm
+targetid=8
 
 [h100]
 name="iHP100 / iHP110"
@@ -153,6 +162,7 @@ manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063001
 voicename=h100
+targetid=11
 
 [h120]
 name="iHP120 / iHP140 / H120 / H140"
@@ -166,6 +176,7 @@ manualname=rockbox-h100
 brand=Iriver
 usbid=0x10063002
 voicename=h120
+targetid=9
 
 [h300]
 name="H320 / H340"
@@ -179,6 +190,7 @@ manualname=rockbox-h300
 brand=Iriver
 usbid=0x10063003
 voicename=h300
+targetid=10
 
 [h10_5gbums]
 name="H10 (5 / 6GB) UMS"
@@ -192,6 +204,7 @@ manualname=
 brand=Iriver
 usbid=0x41022002
 voicename=h10_5gb
+targetid=24
 
 [h10_5gbmtp]
 name="H10 (5 / 6GB) MTP"
@@ -205,6 +218,7 @@ manualname=
 brand=Iriver
 usbid=0x41022105
 voicename=h10_5gb
+targetid=24
 
 [h10]
 name="H10 (20GB)"
@@ -219,6 +233,7 @@ brand=Iriver
 usbid=0x0b7000ba
 usberror=0x41022101
 voicename=h10
+targetid=22
 
 [ipod1g2g]
 name="Ipod (1st / 2nd gen)"
@@ -231,6 +246,7 @@ resolution=160x128x2
 manualname=
 brand=Apple
 voicename=ipod1g2g
+targetid=29
 
 [ipodcolor]
 name="Ipod Colour / Photo / U2 (4th gen)"
@@ -243,6 +259,7 @@ resolution=220x176x16
 manualname=
 brand=Apple
 voicename=ipodcolor
+targetid=13
 
 [ipodnano]
 name="Ipod Nano (1st gen)"
@@ -256,6 +273,7 @@ manualname=
 brand=Apple
 usbid=0x05ac120a
 voicename=ipodnano
+targetid=14
 
 [ipod4gray]
 name="Ipod (4th gen, greyscale)"
@@ -268,6 +286,7 @@ resolution=160x128x2
 manualname=
 brand=Apple
 voicename=ipod4gray
+targetid=17
 
 [ipodvideo]
 name="Ipod Video (5th gen) 30GB"
@@ -280,6 +299,7 @@ resolution=320x240x16
 manualname=
 brand=Apple
 voicename=ipodvideo
+targetid=15
 
 [ipodvideo64mb]
 name="Ipod Video (5th gen) 60/80GB"
@@ -292,6 +312,7 @@ resolution=320x240x16
 manualname=
 brand=Apple
 voicename=ipodvideo
+targetid=15
 
 [ipod3g]
 name="Ipod (3rd gen)"
@@ -305,6 +326,7 @@ manualname=
 brand=Apple
 usbid=0x05ac1201
 voicename=ipod3g
+targetid=16
 
 [ipodmini1g]
 name="Ipod Mini (1st gen)"
@@ -317,6 +339,7 @@ resolution=138x110x2
 manualname=rockbox-ipodmini2g
 brand=Apple
 voicename=ipodmini1g
+targetid=18
 
 [ipodmini2g]
 name="Ipod Mini (2nd gen)"
@@ -329,6 +352,7 @@ resolution=138x110x2
 manualname=rockbox-ipodmini2g
 brand=Apple
 voicename=ipodmini2g
+targetid=21
 
 [iaudiox5]
 name="iAudio X5 / X5L"
@@ -343,6 +367,7 @@ brand=Cowon
 usbid=0x0e210510
 usbid=0x0e210513
 voicename=iaudiox5
+targetid=12
 
 [iaudiox5v]
 name="iAudio X5V"
@@ -355,6 +380,7 @@ resolution=160x128x2
 manualname=
 brand=Cowon
 voicename=iaudiox5v
+targetid=12
 
 [iaudiom5]
 name="iAudio M5 / M5L"
@@ -368,6 +394,7 @@ manualname=
 brand=Cowon
 usbid=0x0e210520
 voicename=iaudiom5
+targetid=28
 
 [gigabeatf]
 name="Gigabeat F / X"
@@ -380,6 +407,7 @@ manualname=
 brand=Toshiba
 usbid=0x09300009
 voicename=gigabeatf
+targetid=20
 
 [sansae200]
 name="Sansa E200"
@@ -394,6 +422,7 @@ brand=Sandisk
 usbid=0x07817421
 usberror=0x07810720
 voicename=sansae200
+targetid=23
 
 [sansac200]
 name="Sansa C200"
@@ -406,80 +435,44 @@ resolution=132x80x16
 manualname=
 brand=Sandisk
 voicename=sansac200
+targetid=30
+
+[languages]
+lang1=africaans
+lang2=bulgarian
+lang3=catala
+lang4=chinese-simp
+lang5=chinese-trad
+lang6=czech
+lang7=dansk
+lang8=deutsch
+lang9=eesti
+lang10=english
+lang11=espanol
+lang12=esperanto
+lang13=finnish
+lang14=francais
+lang15=galego
+lang16=greek
+lang17=hebrew
+lang18=islenska
+lang19=italiano
+lang20=japanese
+lang21=korean
+lang22=magyar
+lang23=nederlands
+lang24=norsk
+lang25=norsk-nynorsk
+lang26=polski
+lang27=portugues
+lang28=portugues-brasileiro
+lang29=romaneste
+lang30=russian
+lang31=slovenscina
+lang32=svenska
+lang33=thai
+lang34=turkce
+lang35=wallisertitsch
 
-[tts]
-ttspreset01 = "espeak (default)"
-ttspreset02 = "espeak (user-adjusted)"
-ttspreset03 = "flite (default)"
-ttspreset04 = "flite (user-adjusted)"
-ttspreset05 = "sapi (default)"
-ttspreset06 = "sapi (user-adjusted)"
-ttspreset07 = "swift (default)"
-ttspreset08 = "swift (user-adjusted)"
-
-
-[ttspreset01]
-tts = "espeak"
-options = ""
-template = "\"%exe\" \"%options\" -w \"%wavfile\" \"%text\""
-edit = false
-os = all
-needslanguagecfg = false 
-
-[ttspreset02]
-tts = "espeak"
-options = ""
-template = "\"%exe\" \"%options\" -w \"%wavfile\" \"%text\""
-edit = true
-os = all
-needslanguagecfg = false
-
-[ttspreset03]
-tts = "flite"
-options = ""
-template = "\"%exe\" \"%options\" -o \"%wavfile\" \"%text\""
-edit = false
-os = all
-needslanguagecfg = false
-
-[ttspreset04]
-tts = "flite"
-options = ""
-template = "\"%exe\" \"%options\" -o \"%wavfile\" \"%text\""
-edit = true
-os = all
-needslanguagecfg = false
-
-[ttspreset05]
-tts = "sapi"
-options = ""
-template = "cscript //nologo \"%exe\" /language:%lang \"%options\""
-edit = false
-os = win32
-needslanguagecfg = true
-
-[ttspreset06]
-tts = "sapi"
-options = ""
-template = "cscript //nologo \"%exe\" /language:%lang \"%options\""
-edit = true
-os = win32
-needslanguagecfg = true
-
-[ttspreset07]
-tts = "swift"
-options = ""
-template = "\"%exe\" \"%options\" -o \"%wavfile\" \"%text\""
-edit = false
-os = all
-needslanguagecfg = false
-
-[ttspreset08]
-tts = "swift"
-options = ""
-template = "\"%exe\" \"%options\" -o \"%wavfile\" \"%text\""
-edit = true
-os = all
-needslanguagecfg = false