Update rbutil translations:

- japanese by Yoshihisa Uchida (FS#10302)
- german by myself
- lupdate all other languages and drop obsolete messages.

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

11 files changed, 3600 insertions, 5284 deletions

diff --git a/rbutil/rbutilqt/lang/rbutil_de.ts b/rbutil/rbutilqt/lang/rbutil_de.ts
index 54b20575a9..3c57146d21 100644
--- a/rbutil/rbutilqt/lang/rbutil_de.ts
+++ b/rbutil/rbutilqt/lang/rbutil_de.ts
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
+<defaultcodec></defaultcodec>
 <context>
     <name>BootloaderInstallBase</name>
     <message>
@@ -134,252 +135,257 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation>prüfe MD5-Hash der Eingabedatei ...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation>Konnte Originalfirmware-Datei nicht prüfen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation>Firmware-Datei nicht erkannt.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation>MD5-Hash ok</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation>Firmware passt nicht zum gewählten Gerät.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation>Descramble Datei</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation>Fehler bei Descramble: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation>Lade Bootloader-Datei herunter</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation>Füge Bootloader zu Firmware-Datei hinzu</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation>Konnte die Eingabedatei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation>Konnte Header nicht lesen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation>Konnte Firmware nicht lesen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation>Konnte Bootloader nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation>Konnte Bootloader nicht lesen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation>Konnte Ausgabedatei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation>Konnte Ausgabedatei nicht schreiben</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation>Fehler beim Patchen %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation>Fehler bei Scramble: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation>Prüfe modifizierte Firmware-Datei</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation>Fehler: Prüfsumme der modifizierten Datei falsch</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation>Erfolg: modifizierte Firmware-Datei erzeugt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation>Konnte Eingabedatei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation>Konnte Ausgabedatei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation>ungültige Datei: Länge des Headers ist falsch</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation>ungültige Datei: unbekannter Header</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation>ungültige Datei: &quot;length&quot; Eintrag ist falsch</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation>ungültige Datei: &quot;length2&quot; Eintrag ist falsch</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation>ungültige Datei: interne Prüfsumme ist falsch</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation>ungültige Datei: &quot;length3&quot; Eintrag ist falsch</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished">Die Bootloader-Installation benötigt eine Firmware-Datei der originalen Firmware (Hex-Datei). Diese Datei muss aus rechtlichen Gründen separat heruntergeladen werden. Informationen wie diese Datei heruntergeladen werden kann sind im &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;Handbuch&lt;/a&gt; und der Wiki-Seite &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; aufgeführt.&lt;br/&gt;OK um fortfahren und die Datei auf dem Computer auszuwählen.</translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>Fehler: kann Speicher nicht allokieren!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation>Kein Ipod gefunden
 Laufwerkszugriff verweigert!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation>Kein Ipod gefunden!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation>Lade Bootloader-Datei herunter</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation>Konnte Firmwareverzeichnis nicht lesen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation>Unbekannte Versionsnummer in Firmware (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation>Kann Ipod nicht im R/W-Modus öffnen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation>Bootloader erfolgreich hinzugefügt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation>Konnte Bootloader nicht hinzufügen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation>Kein Bootloader erkannt.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation>Konnte Ipod nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation>Konnte Partitionstabelle nicht lesen</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation>Keine Firmware-Partition auf dem Laufwerk</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation>Warnung: Dies ist ein MacPod, Rockbox läuft nur auf WinPods.
 Siehe http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation>Bootloader erfolgreich entfernt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation>Entfernen des Bootloaders fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished">Installiere Rockbox Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation>Entferne Bootloader</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation>Fehler beim Lesen der Partitionstabelle - möglicherweise kein Ipod</translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -427,49 +433,34 @@ Siehe http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>Fehler: kann Speicher nicht allokieren!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation>Suche nach Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation>Direkter Laufwerkszugriff verweigert!
 Der Zugriff ist notwendig um den Bootloader zu installieren</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation>Kein Sansa gefunden!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation>Lade Bootloader-Datei herunter</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation>Konnte Sansa nicht öffnen </translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation>Konnte die Partitionstabelle nicht lesen</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation>Laufwerk ist kein Sansa (Fehler: %1), abbruch.</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -482,67 +473,67 @@ Siehe http://www.rockbox.org/wiki/SansaE200Install
 </translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation>Konnte Sansa nicht im R/W-Modus öffnen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation>Bootloader erfolgreich installiert</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation>Bootloader-Installation fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation>Konnte Sansa nicht finden</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation>Konnte Sansa nicht öffnen </translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation>Konnte Partitionstabelle nicht lesen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation>Laufwerk ist kein Sansa (Fehler: %1), breche ab.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation>Bootloader erfolgreich entfernt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation>Entfernen des Bootloaders fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished">Installiere Rockbox Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation>Entferne Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished">Prüfe heruntergeladenen Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished">Fehler im Bootloader! Abbruch.</translation>
     </message>
@@ -573,150 +564,150 @@ Siehe http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>Sprache geändert</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>Die Anwendung muss neu gestartet werden um die geänderten Spracheinstallungen anzuwenden.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>Automatische Erkennung</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Konnte Einhängepunkt nicht erkennen.
 Bitte manuell auswählen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Konnte kein Gerät erkennen.
 Bitte Gerät und Einhängepunt manuell auswählen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>Cache wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Cache wirklich löschen? Unbedingt sicherstellen dass die Enstellungen korrekt sind, dies löscht &lt;b&gt;alle&lt;/b&gt; Dateien im Cache-Ordner!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>Pfad fehlerhaft!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Cache-Pfad ist ungültig. Abbruch.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Aktuelle Cachegröße ist %L1 kiB. </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation>Gerät auswählen</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>Sansa e200 in MTP Modus gefunden!
 Das Gerät muss für die Installation in den MSC-Modus umgestellt werden.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation>H10 20GB in MTP Modus gefunden!
 Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation>Die Installation wird fehlschlagen bis dies korrigiert ist!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation>Fataler Fehler</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation>Nicht unterstützte %1 Gerätevariante erkannt. Rockbox funktioniert leider nicht auf diesem Gerät.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation>Fataler Fehler: inkompatibles Gerät gefunden </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation>Konfiguration OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation>Konfiguration UNGÜLTIG</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation>Die folgenden Fehler sind aufgetreten:</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation>Kein Einhängepunkt ausgewählt</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation>Einhängepunkt existiert nicht</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation>Einhängepunkt ist kein Verzeichnis</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation>Einhängepunkt ist nicht schreibbar</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation>Kein Gerät ausgewählt</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Cache-Pfad ist nicht schreibbar. Um auf den temporären Pfad des Systems zurückzusetzen den Pfad leer lassen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>Die Fehler müssen beseitigt werden um fortzufahren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation>Konfigurationsfehler</translation>
     </message>
@@ -922,7 +913,7 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Deutsch</translation>
@@ -979,57 +970,83 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Gewähltes TTS-System: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Gewählter Encoder: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Konfiguration</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation>Pfad zum Encoder:</translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
-        <translation>Encoder konfigurieren</translation>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
+        <translation>Encoder Optionen:</translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
-        <translation>Pfad zum Encoder</translation>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
+        <translation>Lautstärke:</translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>D&amp;urchsuchen</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation>Qualität:</translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation>Encoder-Optionen</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation>Komplexität:</translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Zurücksetzen</translation>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
+        <translation>Benutze Schmalband:</translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished">Warte auf Engine ...</translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation>Durchsuchen</translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation>Aktualisieren</translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation>Programm auswählen</translation>
     </message>
 </context>
 <context>
@@ -1040,27 +1057,22 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
         <translation>Falscher Einhängepunkt!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>Dies ist die letzte veröffentlichte Version von Rockbox.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Hinweis:&lt;/b&gt; Die letzte veröffentlichte Version ist %1. &lt;b&gt;Dies ist die empfohlene Version.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation type="unfinished">Dies ist das aktuellste Rockbox build. Es wird bei jeder Änderung aktualisiert. Letzte Version ist r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;Hinweis:&lt;/b&gt; Archivierte Version ist r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation type="unfinished">Diese Builds werden jeden Tag automatisch aus dem aktuellen Source Code gebaut. Sie haben meist mehr Features als das letzte stabile Release, können aber weniger stabil sein. Features können sich regelmäßig ändern.</translation>
     </message>
@@ -1075,12 +1087,12 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
         <translation>Erstelle Sicherungskopie ...</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation>Sicherung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation>Sicherung fehlgeschlagen!</translation>
     </message>
@@ -1095,15 +1107,20 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
         <translation>Sicherungskopie nach %1</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation>Dateiname für Sicherungskopie auswählen</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dies ist die empfohlene Version.&lt;/b&gt;</translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished">&lt;b&gt;Hinweis:&lt;/b&gt; Die letzte Release-Version ist %1. &lt;b&gt;Dies ist die empfohlene Version.&lt;/b&gt;</translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1274,17 +1291,17 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>Der Ordner für den Talk-Dateien erzeugt werden sollen ist falsch!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Gewähltes TTS-System: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Gewählter Encoder: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1318,12 +1335,12 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>&amp;Abbrechen</translation>
     </message>
@@ -1331,389 +1348,336 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation>Gast</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation>Admin</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation>(keine Beschreibung verfügbar)</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Bereichtigung für Bootloader-Installation nicht ausreichend.
 Administratorrechte sind notwendig.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Abweichendes Gerät erkannt.
 Installiertes Gerät: %1, gewähltes Gerät: %2.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation>Problem gefunden:</translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation>Konfiguriere RbSpeex Encoder</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation>Lautstärke</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation>Schmalband</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation>Qualität</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation>Komplexität</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation>Zurücksetzen</translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>Netzwerkfehler: %1. Bitte Netzwerk und Proxyeinstellungen überprüfen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; an &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;PDF-Handbuch&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;HTML-Handbuch (öffnet im Browser)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>Ein Gerät muss ausgewählt sein, damit ein Link zum entsprechenden Handbuch angezeigt wird</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Anleitungen-Übersicht&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>Installation bestätigen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>Bootloader wirklich installieren?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>Schriftarten-Paket wirklich installieren?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>Sprachdateien wirklich installieren?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>Zusatzdateien für Spiele wirklich installieren?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>Entfernen bestätigen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Bootloader wirklich entfernen?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>Download bestätigen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>Handbuch wirklich herunterladen? Das Handbuch wird im Wurzelordner des Geräts gespeichert.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>Installation bestätigen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Rockbox Utility wirklich auf dem Gerät installieren? Nach der Installation kann es von dem Laufwerk des Geräts ausgeführt werden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>Installiere Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Falscher Einhängepunkt!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Fehler beim installieren von Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>Installiere Benutzerkonfiguration</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>Fehler beim installieren der Benutzerkonfiguration</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility erfolgreich installiert.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation>Konfigurationsfehler</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation>Für das gewählte Gerät existiert kein Doom-Plugin. Abbruch.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Die Konfiguration ist ungültig. Bitte im Konfigurationsdialog sicherstellen dass die Einstellungen korrekt sind.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Dies ist eine neue Installation oder eine neue Version von Rockbox Utility. Der Konfigurationsdialog wird nun automatisch geöffnet umd das Programm zu konfigurieren oder die Einstellungen zu prüfen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation>Abgebrochen!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation>Installiertes Rockbox erkannt</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation>Installiertes Rockbox erkannt. Soll zunächst eine Sicherungskopie gemacht werden?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation>Sicherung fehlgeschlagen!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation type="unfinished">Das Progamm lädt noch Informationen über neue Builds. Bitte in Kürze nochmals versuchen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation>Erstelle Sicherungskopie ...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation>Neue Installation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Die Konfiguration ist ungültig. Dies kommt wahrscheinlich von einem geänderten Gerätepfad. Der Konfigurationsdialog wird geöffnet, damit das Problem korrigiert werden kann.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation>Sicherung erfolgreich</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation>Netzwerkfehler</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation>Konnte Versionsinformationen nicht laden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation>Wirklich fortfahren?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation>Keine Installationsmethode bekannt.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation>Bootloader erkannt</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation>Bootloader ist bereits installiert. Soll der Bootloader neu installiert werden?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation>Erzeuge Sicherungskopie vom Bootloader</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation>Es kann eine Sicherungskopie der originalen Bootloader-Datei erstellt werden. &quot;Ja&quot; um einen Zielordner auf dem Computer auszuwählen. Die Datei wird in einem neuen Unterordner &quot;%1&quot; im gewählten Ordner abgelegt.
 &quot;Nein&quot; um diesen Schritt zu überspringen.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation>Ordner für Sicherungskopie suchen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation>Voraussetzungen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="unfinished">Die Bootloader-Installation benötigt eine Firmware-Datei der originalen Firmware (Hex-Datei). Diese Datei muss aus rechtlichen Gründen separat heruntergeladen werden. Informationen wie diese Datei heruntergeladen werden kann sind im &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;Handbuch&lt;/a&gt; und der Wiki-Seite &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; aufgeführt.&lt;br/&gt;OK um fortfahren und die Datei auf dem Computer auszuwählen.</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation>Firmware-Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation>Fehler beim Öffnen der Firmware-Datei</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation>Sicherungskopie-Fehler</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation>Konnte Sicherungskopie-Datei nicht erzeugen. Fortfahren?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation>Manuelle Schritte erforderlich</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation>Keine Deinstallationsmethode bekannt.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1722,19 +1686,19 @@ This will install Rockbox %1. To install the most recent development build avail
 Dies installiert Rockbox %1. Um die letzte Entwicklerversion zu installieren &quot;Abbrechen&quot; wählen und den Reiter &quot;Installation&quot; verwenden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation>Wirklich eine Minimalinstallation durchführen? Eine Minimalinstallation enthält nur die Teile die zum Verwenden von Rockbox absolut notwendig sind.Dies installiert Rockbox %1. Um die letzte Entwicklerversion zu installieren &quot;Abbrechen&quot; wählen und den Reiter &quot;Installation&quot; verwenden.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation>Bootloader-Installation übersprungen</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation>Bootloader-Installation abgebrochen</translation>
     </message>
@@ -2144,59 +2108,6 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Konfiguriere TTS-System</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation>TTS-Optionen</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation>Sprache</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation>Zurücksetzen</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation>Stimme</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation>Geschwindigkeit</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation>Sapi 4 verwenden</translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2255,150 +2166,86 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation>TTS-System nicht gefunden</translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Konfiguration</translation>
-    </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Konfiguriere TTS-System</translation>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
+        <translation>Pfad zum TTS-System:</translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation>Pfad zum TTS-System</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>D&amp;urchsuchen</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
-        <translation>TTS-Optionen</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Zurücksetzen</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
+        <translation>TTS-System Optionen:</translation>
     </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished">Starte Festival</translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konnte String nicht sprechen</translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
-        <translation type="unfinished"></translation>
+        <translation>keine Beschreibung verfügbar</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
+        <translation>Pfad zu Festival-Client:</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
+        <translation>Stimme:</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
+        <translation>Stimmenbeschreibung:</translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
+        <translation>Konnte Sapi-Skript nicht kopieren</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished">&amp;Aktualisieren</translation>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
+        <translation>Konnte Sapi-Skript nicht starten</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
+        <translation>Sprache:</translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
+        <translation>Stimme:</translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TTSSapi</name>
-    <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
-        <translation>Konnte Sapi-Skript nicht kopieren</translation>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
+        <translation>Geschwindigkeit:</translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
-        <translation>Konnte Sapi-Skript nicht starten</translation>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
+        <translation>Optionen:</translation>
     </message>
 </context>
 <context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation>Beginne Talkdatei-Erzeugung</translation>
     </message>
@@ -2408,62 +2255,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation>Initalisierung des TTS-Systems fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation>Initalisierung des Encoders fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation>Erzeugen der Sprachdatei abgebrochen</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation>Kodieren of %1 ist fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation>Erstellen der Sprachdateien beendet</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation>Lese Dateiliste ...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation>Spreche Einträge ...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation>Kodiere Dateien ...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation>Kopiere Sprachateien für Ordner ...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation>Kopiere Sprachdateien für Dateien ...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Kopieren von %1 nach %2 fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation>Räume auf ...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished">Sprechen von %1 fehlgeschlagen: %2</translation>
     </message>
@@ -2509,91 +2356,91 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>Kein Theme ausgewählt</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Netzwerkfehler: %1
 Bitte Netzwerk- und Proxyeinstellungen überprüfen.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation>Der folgende Fehler ist aufgetreten:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>Abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>lade Details für %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>lade Vorschau ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Autor:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>Keine Beschreibung vorhanden</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>Keine Themevorschau vorhanden</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>lade Theme-Informationen ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>Einhängepunkt ungültig!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Beschreibung:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation>keine Auswahl</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation>
             <numerusform>Download-Größe %L1 kiB (%n Element)</numerusform>
@@ -2601,7 +2448,7 @@ Bitte Netzwerk- und Proxyeinstellungen überprüfen.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>Laden der Vorschau fehlgeschlagen.
@@ -2611,87 +2458,87 @@ HTTP Antwortcode: %1</translation>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>ZIP-Operation erfolgreich abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>Initialisieren oder Laden der zlib-Bibliothek fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>Fehler in zlib-Bibliothek.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>Erzeugen oder Öffnen der Datei fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>Teilweise korruptes Archiv. Einige Dateien wurden möglicherweise extrahiert.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>Korruptes Archiv.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>Falsches Passwort.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>Momentan kein Archiv verfügbar.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>Datei oder Ordner existiert nicht.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>Fehler beim Lesen der Datei.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>Fehler beim Schreiben der Datei.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>Fehler beim Durchsuchen der Datei.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>Kann Verzeichnis nicht erstellen.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>Ungültiges Gerät.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>Ungültiges oder inkompatibles Zip-Archiv.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation>Inkonsistente Header. Archiv ist möglicherweise beschädigt.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>Unbekannter Fehler.</translation>
     </message>
@@ -2775,37 +2622,37 @@ HTTP Antwortcode: %1</translation>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation>Erzeugen der Sprachdatei beginnt</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Fehler beim Herunterladen: HTTP Fehler %1.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation>Datei aus Cache verwendet.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation>Downloadfehler: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation>Download abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation>Konnte heruntergeladene Datei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation>Initalisierung des TTS-Systems fehlgeschlagen</translation>
     </message>
@@ -2840,7 +2687,7 @@ HTTP Antwortcode: %1</translation>
         <translation>erfolgreich erzeugt.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation>Konnte rockbox-info.txt nicht finden</translation>
     </message>
@@ -2901,72 +2748,72 @@ HTTP Antwortcode: %1</translation>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>Abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>Installation erfolgreich abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>Herunterladen von Datei %1.%2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Fehler beim Herunterladen: HTTP Fehler %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>Downloadfehler: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>Download abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>Extrahiere Datei.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>Öffnen des Archives fehlgeschlagen: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>Extrahieren fehlgeschlagen: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>Installiere Datei.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>Dateiinstallation fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>Erstelle Installationslog</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>Datei aus Cache verwendet.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Nicht genügend Speicherplatz verfügbar! Abbruch.</translation>
     </message>
@@ -2984,12 +2831,12 @@ HTTP Antwortcode: %1</translation>
         <translation>&amp;Credits</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>&amp;Lizenz</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_fi.ts b/rbutil/rbutilqt/lang/rbutil_fi.ts
index 9352361e00..9d140a880e 100644
--- a/rbutil/rbutilqt/lang/rbutil_fi.ts
+++ b/rbutil/rbutilqt/lang/rbutil_fi.ts
@@ -134,250 +134,255 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation type="unfinished">ohjelmiston lukeminen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation type="unfinished">Virhe avattaessa kohdetiedostoa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation type="unfinished">tuntematon</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation type="unfinished">Ohjelmistohakemistoa ei voitu lukea</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation type="unfinished">Tuntematon ohjelmiston versio (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation type="unfinished">Käynnistyslatainta ei havaittu.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -425,48 +430,33 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation type="unfinished">Sansaa ei voitu avata</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation type="unfinished">osiotaulukkoa ei voitu lukea</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -475,67 +465,67 @@ See http://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -566,150 +556,150 @@ See http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>Kieli vaihdettu</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>Sovellus tulee käynnistää uudelleen, jotta muutokset tulevat voimaan.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Nykyinen välimuistin koko on %L1 kt.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation>Asetukset kunnossa</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation>Vialliset asetukset</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation>Valitse laitteesi</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>Sansa e200 löydetty MTP-tilassa!
 Vaihda MSC-tilaan asennusta varten.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation>H10 20GT löydetty MTP-tilassa!
 Vaihda UMS-tilaan asennusta varten.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation>Vakava virhe</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation>Vakava virhe: tuntematon soitin löydetty</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>Automaattinen tunnistus</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Liitospistettä ei voitu tunnistaa
 Valitse liitospiste käsin.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Laitetta ei voitu tunnistaa
 Valitse laite ja liitospiste käsin.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>Oletko varma että haluat tyhjentää välimuistin?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Haluatko varmasti tyhjentää välimuistin? Varmista kaksi kertaa, sillä tämä poistaa &lt;b&gt;kaikki&lt;/b&gt; tiedostot tästä hakemistosta!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>Polku väärin!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Välimuistin polku on epäkelpo. Keskeytetään.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation type="unfinished">Asetusvirhe</translation>
     </message>
@@ -915,7 +905,7 @@ Valitse laite ja liitospiste käsin.</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Suomi</translation>
@@ -972,57 +962,83 @@ Valitse laite ja liitospiste käsin.</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Valittu puhesyntetisaattori: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Valittu pakkaus:&lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Asetukset</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
-        <translation>Määritä pakkauksen asetukset</translation>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
-        <translation>Pakkausohjelman polku</translation>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>&amp;Selaa</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation>Pakkausohjelman valinnat</translation>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Palauta</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Peruuta</translation>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1043,37 +1059,32 @@ Valitse laite ja liitospiste käsin.</translation>
         <translation>Aloitetaan varmuuskopiointia...</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation>Varmuuskopiointi epäonnistui!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>Tämä on Rockboxin uusin versio.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Huomaa:&lt;/b&gt;Rockboxin uusin versio on %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;Huomaa:&lt;/b&gt;arkistoitu versio on r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1088,15 +1099,20 @@ Valitse laite ja liitospiste käsin.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1267,17 +1283,17 @@ Valitse laite ja liitospiste käsin.</translation>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Valittu puhesyntetisaattori: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Valittu pakkaus:&lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1311,12 +1327,12 @@ Valitse laite ja liitospiste käsin.</translation>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>&amp;Keskeytä</translation>
     </message>
@@ -1324,406 +1340,353 @@ Valitse laite ja liitospiste käsin.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation>Vieras</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation>Pääkäyttäjä</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation>Käyttäjä</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation>virhe</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation>(ei kuvausta saatavilla)</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation>Voimakkuus</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation>Laatu</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation>Palauta</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Peruuta</translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>Versio</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation>Uusi asennus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Tämä on uusi asennus tai uusi versio. Asetusikkuna aukeaa ja voit tehdä ja tarkistaa asetukset.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation>Asetusvirhe</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Asetuksesi eivät ole kunnossa. Yleensä tämä johtuu vaihtuneesta laitteen osoitteesta. Asetusikkuna aukeaa, voit korjata asetukset siitä.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>Verkkovirhe: %1
 Tarkista verkko- ja välityspalvelinasetukset.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; osoitteessa &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;PDF-ohjekirja (englanniksi)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;HTML-ohjekirja (aukeaa selaimessa)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>Valitse laitteesi oikean laitteen ohjetta varten</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Ohjekirjan yleiskuva&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>Vahvista asennus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Liitospiste on väärin!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation>Keskeytetty!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation>Aiempi asennus löydetty</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation>Aiempi Rockboxin asennus havaittu. Haluatko ottaa varmuuskopiot ensin?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation>Aloitetaan varmuuskopiointia...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation>Varmuuskopiointi epäonnistui!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>Haluatko varmasti asentaa käynnistyslataimen?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>Haluatko varmasti asentaa fonttipaketin?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation>Ohjelma lataa tietoja uusista versioista. Yritä uudelleen hetken päästä.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>Haluatko varmasti asentaa äänitiedoston?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation>Laitteessasi ei ole doom-lisäosaa. Keskeytetään.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>Haluatko varmasti asentaa pelitiedostot?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>Vahvista asennuksen poisto</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Haluatko varmasti poistaa käynnistyslataimen?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>Vahvista lataus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>Haluatko varmasti ladata ohjekirjan? Ohjekirja tallennetaan soittimeesi.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>Vahvista asennus</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Haluatko varmasti asentaa Rockbox Utilityn soittimeesi? Asennuksen jälkeen voit ajaa sen soittimeltasi.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>Asennetaan Rockbox Utilityä</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Virhe asennettaessa Rockbox Utilityä</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>Asennetaan käyttäjän asetuksia</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>Virhe asennettaessa käyttäjän asetuksia</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility asennettu.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2133,59 +2096,6 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Määritä puhesyntetisaattorin asetukset</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation>Kieli</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation>Ääni</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation>Nopeus</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation>Puhesyntetisaattorin valinnat</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation>Palauta</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Peruuta</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation>Käytä Sapi 4:ää</translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2244,150 +2154,86 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation>Puhesyntetisaattoria ei löytynyt</translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Määritä puhesyntetisaattorin asetukset</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation>Polku puhesyntetisaattoriin</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>&amp;Selaa</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
-        <translation>Puhesyntetisaattorin valinnat</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Palauta</translation>
-    </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Peruuta</translation>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
+        <translation>Sapi-skriptiä ei voitu kopioida</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
+        <translation>Sapi-skriptiä ei voitu ajaa</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished">&amp;Päivitä</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TTSSapi</name>
-    <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
-        <translation>Sapi-skriptiä ei voitu kopioida</translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
-        <translation>Sapi-skriptiä ei voitu ajaa</translation>
-    </message>
-</context>
-<context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation>Aloitetaan puhetiedostojen luontia</translation>
     </message>
@@ -2397,62 +2243,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation>Puhesyntetisaattorin alustus epäonnistui</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation>Pakkausohjelman alustus epäonnistui</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation>Puhetiedostojen luonti keskeytetty</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation>Tiedoston %1 pakkaus epäonnistui</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation>Puhetiedostojen luonti valmis</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2498,98 +2344,98 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>ei teemaa valittu</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Verkkovirhe: %1
 Tarkista verkko- ja välityspalvelinasetukset.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation>seuraava virhe tapahtui:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>valmis.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>haetaan lisätietoja teemalle %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>haetaan esikatselukuvaa ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Tekijä:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Versio:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Kuvaus:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>ei kuvausta</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>ei esikatselukuvaa</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>haetaan teemojen tietoja ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>Liitospiste on väärin!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -2598,87 +2444,87 @@ HTTP response code: %1</source>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>ZIP-toiminto onnistui.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>Zlib-kirjaston lataus tai alustus epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>zlib-kirjaston virhe.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>Tiedoston avaus tai luonti epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>Osittain korruptoitunut paketti. Joitakin tiedostoja puuttuu.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>Korruptoitunut paketti.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>Väärä salasana.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>Pakettia ei ole luotu vielä.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>Tiedostoa tai hakemistoa ei ole.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>Tiedoston lukuvirhe.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>Tiedoston kirjoitusvirhe.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>Tiedoston hakuvirhe.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>Hakemiston luonti epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>Epäkelpo laite.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>Huono tai yhteensopimaton zip-paketti.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>Tuntematon virhe.</translation>
     </message>
@@ -2762,37 +2608,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation>Aloitetaan äänitiedostojen luontia</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Latausvirhe: HTTP-virhe %1.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation>Käytetään välimuistissa olevaa tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation>Latausvirhe: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation>Lataus valmis.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation>ladattua tiedostoa ei voitu avata</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation>Puhesyntetisaattorin alustus epäonnistui</translation>
     </message>
@@ -2827,7 +2673,7 @@ HTTP response code: %1</source>
         <translation>luotu.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2888,72 +2734,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>valmis.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>Asennus onnistui.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>Ladataan tiedostoa %1.%2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Latausvirhe: HTTP-virhe %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>Käytetään välimuistissa olevaa tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>Latausvirhe: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>Lataus valmis.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>Puretaan tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>Paketin avaus epäonnistui: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>Paketin purkaminen epäonnistui: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>Asennetaan tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>Tiedoston asentaminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>Luodaan lokitiedostoa asennuksesta</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2976,12 +2822,12 @@ HTTP response code: %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>&amp;Lisenssi</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_fr.ts b/rbutil/rbutilqt/lang/rbutil_fr.ts
index 942f5050c4..5069dc950c 100644
--- a/rbutil/rbutilqt/lang/rbutil_fr.ts
+++ b/rbutil/rbutilqt/lang/rbutil_fr.ts
@@ -134,250 +134,255 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation type="unfinished">Error dans descramble : %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation type="unfinished">Impossible d&apos;ouvrir le fichier d&apos;entrée</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation type="unfinished">La lecture de l&apos;en-tête a échoué</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation type="unfinished">La lecture du firmware a échoué</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation type="unfinished">Impossible d&apos;ouvrir le fichier de bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation type="unfinished">La lecture du fichier du bootloader a échoué</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation type="unfinished">Impossible d&apos;ouvrir le fichier de sortie</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation type="unfinished">L&apos;écriture du fichier de sortie a échoué</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation type="unfinished">Erreur dans la modification : %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation type="unfinished">Erreur dans scramble : %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation type="unfinished">Impossible d&apos;ouvrir le fichier d&apos;entrée</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation type="unfinished">Impossible d&apos;ouvrir le fichier de sortie</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation type="unfinished">Fichier invalide : longueur de l&apos;en-tête incorrecte</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation type="unfinished">Fichier invalide : en-tête non reconnu</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation type="unfinished">Fichier invalide : champ &quot;longueur&quot; erroné</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation type="unfinished">Fichier invalide : champ &quot;longueur2&quot; erroné</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation type="unfinished">Fichier invalide : erreur interne de somme de contrôle</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation type="unfinished">Fichier invalide : champ &quot;longueur3&quot; erroné</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation type="unfinished">inconnu</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation type="unfinished">La lecture du dossier du firmware a échoué</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation type="unfinished">Numéro de version inconnu dans le firmware (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation type="unfinished">Aucun bootloader détecté.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -425,48 +430,33 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation type="unfinished">impossible d&apos;ouvrir le sansa</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation type="unfinished">impossible de lire la table des partitions</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -475,67 +465,67 @@ See http://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -566,150 +556,150 @@ See http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>Changement de langue</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>Vous devez redémarrer l&apos;application pour que le changement de langue prenne effet.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>Autodétection</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Impossible de détecter un point de montage.
 Veuillez sélectionner manuellement le point de montage.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Impossible de détecter le périphérique.
 Veuillez sélectionner manuellement le type de périphérique et le point de montage.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>Supprimer le cache ?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Voulez-vous supprimer le cache ? Vérifier bien que ce paramètre est correct car il supprimera &lt;b&gt;tous&lt;/b&gt; les fichiers de ce répertoire !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>Chemin incorrect !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Le chemin du cache est invalide. Annulation.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation>Sélectionnez votre périphérique</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>Sansa e200 en mode MTP trouvé !
 Vous devez mettre votre lecteur audio en mode MSC pour l&apos;installation. </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation>H10 20 Go en mode MTP trouvé !
 Vous devez mettre votre lecteur en mode UMS pour l&apos;installation. </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation>Si vous n&apos;avez pas changé ceci, l&apos;installation échouera !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation>Erreur fatale</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>La taille actuelle du cache est %L1 ko.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation>Une variante non supportée %1 de lecteur a été détectée. Malheuresement Rockbox ne supporte pas ce modèle.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation>Erreur fatale : lecteur audio incompatible détecté</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation type="unfinished">Erreur de configuration</translation>
     </message>
@@ -918,7 +908,7 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Français</translation>
@@ -975,57 +965,83 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Moteur TTS sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Encodeur sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
-        <translation>Configurer l&apos;encodeur</translation>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
-        <translation>Chemin vers l&apos;encodeur</translation>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>&amp;Parcourir</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation>Options de l&apos;encodeur</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Remettre à zéro</translation>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;OK</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1036,27 +1052,22 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
         <translation>Le point de montage est incorrect !</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation>C&apos;est la version la plus récente possible. Elle est mise à jour à chaque fois qu&apos;un changement est fait. La version actuelle est r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>C&apos;est la dernière version publique officielle de Rockbox.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Note :&lt;/b&gt; La dernière version publique officielle est %1. &lt;b&gt;C&apos;est la version recommendée.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation>Celles-ci sont compilées chaque jour à partir du code source courant. Il y a généralement plus de fonctionnalités que dans la dernière version publique officielle mais le stabilité n&apos;est pas garantie. les fonctionnalités peuvent changer.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;Note :&lt;/b&gt; la version archivée est r%1 (%2).</translation>
     </message>
@@ -1071,12 +1082,12 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
         <translation>Début de la sauvegarde...</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation type="unfinished">Sauvegarde effectuée avec succès</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation>Sauvegarde échouée !</translation>
     </message>
@@ -1091,15 +1102,20 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1270,17 +1286,17 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>Le dossier à dire est faux !</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Moteur TTS sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Encodeur sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1314,12 +1330,12 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>&amp;Annuler</translation>
     </message>
@@ -1327,405 +1343,352 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation>Invité</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation>Administrateur</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation>(aucune description disponible)</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation>Configurer l&apos;encodeur RbSpeex</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation type="unfinished">Narrowband</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation>Qualité</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation>Complexité</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation>Remettre à zéro</translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>Erreur réseau: %1. Veuillez vérifier vos paramètres réseau et proxy.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; sur &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Manuel PDF&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Manuel HTML (ouvre un navigateur)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>Sélectionnez un périphérique pour obtenir un lien vers le manuel approprié</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Tous les manuels&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>Confirmation de l&apos;installation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Le point de montage est erroné !</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>Etes-vous sûr de vouloir installer le bootloader ?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>Etes-vous sûr de vouloir installer le pack de polices de caractères ?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>Etes-vous sûr de vouloir installer le fichier de voix ?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>Etes-vous sûr de vouloir installer les fichiers additionnels de jeu ?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>Confirmation de la désinstallation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Etes-vous sûr de vouloir désinstaller le bootloader ?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>Confirmation du téléchargement</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>Etes-vous sûr de vouloir télécharger le manuel ? Il sera sauvegardé dans le dossier racine de votre lecteur audio.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>Confirmation de l&apos;installation</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Etes-vous sûr de vouloir installer l&apos;utilitaire Rockbox sur votre lecteur audio ? Après l&apos;installation vous pourrez le lancer depuis le disque dur de votre lecteur audio.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>Installation de l&apos;utilitaire Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Erreur pendant l&apos;installation de l&apos;utilitaire Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>Installation de la configuration utilisateur</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>Erreur pendant l&apos;installation de la configuration utilisateur</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Installation de l&apos;utilitaire Rockbox terminée avec succès.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation>Erreur de configuration</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation>Votre périphérique n&apos;a pas de le plugin Doom. Annulation.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Votre configuration est invalide. Veuillez vérifier que les valeurs sélectionnées sont correctes dans la fenêtre de configuration.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation type="unfinished">Votre configuration est invalide. Ceci est probablement dû à une nouvelle installation de l&apos;utilitaire Rockbox ou à un changement du chemin du périphérique. La fenêtre de configuration va s&apos;ouvrir pour vous permettre de corriger le problème.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation>Abandonné !</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation>Installation de Rockbox détectée</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation>Une installation de Rockox a été détectée. Souhaitez-vous la sauvegarder avant de continuer ?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation>Sauvegarde échouée !</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation>L&apos;application est encore en train de télécharger les informations sur les dernières versions. Veuillez réessayer dans un instant.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation>Début de la sauvegarde...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation type="unfinished">Sauvegarde effectuée avec succès</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2135,59 +2098,6 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Configurer le moteur TTS</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation>Options TTS</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation>Langue</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation>Remettre à zéro</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation>Voix</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation>Vitesse</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation>Utiliser Sapi 4</translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2246,150 +2156,86 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation>Exécutable TTS non trouvé</translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Configurer le moteur TTS</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation>Chemin vers le moteur TTS</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>&amp;Parcourir</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
-        <translation>Options TTS</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Remettre à zéro</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;OK</translation>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Configuration</translation>
-    </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
+        <translation>Impossible de copier le script Sapi</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
+        <translation>Impossible de démarrer le script Sapi</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished">&amp;Rafraîchir</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TTSSapi</name>
-    <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
-        <translation>Impossible de copier le script Sapi</translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
-        <translation>Impossible de démarrer le script Sapi</translation>
-    </message>
-</context>
-<context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation>Démarrage de la génération des fichiers d&apos;annonce</translation>
     </message>
@@ -2399,62 +2245,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation>L&apos;initialisation du moteur TTS a échoué</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation>L&apos;initialisation de l&quot;encodeur a échoué</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation>Création des fichiers d&apos;annonce abandonnée</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation>L&apos;encodage de %1 a échoué</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation>Création des fichiers d&apos;annonce terminée</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2500,91 +2346,91 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>pas de thème sélectionné</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Erreur réseau: %1.
 Veuillez vérifier vos paramètres réseau et proxy.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation>L&apos;erreur suivante s&apos;est produite :
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>terminé.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>récupération des détails pour %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>récupération de l&apos;aperçu ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Auteur :&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>pas de description</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>pas d&apos;aperçu du thème</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>récupération des informations sur le thème ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>Le point de montage est incorrect !</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -2592,7 +2438,7 @@ Veuillez vérifier vos paramètres réseau et proxy.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -2601,87 +2447,87 @@ HTTP response code: %1</source>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>Opération ZIP terminée avec succès.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>Impossible d&apos;initialiser ou de charger la librairie zlib.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>Erreur de la librairie zlib.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>Impossible de créer ou d&apos;ouvrir le fichier.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>Archive partiellement corrompue. Certains fichiers pourraient être extraits.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>Archive corrompue.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>Mot de passe incorrect.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>Aucune archive n&apos;a encore été crée.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>Le fichier ou le répertoire n&apos;existe pas.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>Erreur de lecture du fichier.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>Erreur d&apos;écriture du fichier.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>Erreur de parcours du fichier.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>Impossible de créer un dossier.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>Périphérique invalide.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>Archive zip invalide ou incompatible.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation>Les en-têtes ne correspondent pas. L&apos;archive est peut-être corrompue.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>Erreur inconnue.</translation>
     </message>
@@ -2765,37 +2611,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation>Démarrage de la génération du fichier de voix</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Erreur de téléchargement : Erreur HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation>Fichier en cache utilisé.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation>Erreur de téléchargement : %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation>Téléchargement terminé.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation>Impossible d&apos;ouvrir le fichier téléchargé</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation>L&apos;initialisation du moteur TTS a échoué</translation>
     </message>
@@ -2830,7 +2676,7 @@ HTTP response code: %1</source>
         <translation>Créé avec succes.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2891,72 +2737,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>terminé.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>Installation terminée avec succès.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>Téléchargement du fichier %1.%2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Erreur de téléchargement. Erreur HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>Fichier en cache utilisé.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>Erreur de téléchargement : %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>Téléchargement terminé.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>Extraction du fichier.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>L&apos;ouverture de l&apos;archive a échoué : %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>L&apos;extraction a échoué : %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>Installation du fichier.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>L&apos;installation du fichier a échoué.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>Création du journal d&apos;installation</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2984,12 +2830,12 @@ HTTP response code: %1</source>
         <translation>&amp;Crédits</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>&amp;Licence</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_gr.ts b/rbutil/rbutilqt/lang/rbutil_gr.ts
index ae6b6e1380..f54a770dd5 100644
--- a/rbutil/rbutilqt/lang/rbutil_gr.ts
+++ b/rbutil/rbutilqt/lang/rbutil_gr.ts
@@ -134,252 +134,257 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation>Έλεγχος σύνοψης MD5 του αρχείου εισαγωγής ...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation>Αδύνατη η επαλήθευση το αυθεντικού αρχείου firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation>Το αρχείο firmware δεν είναι αναγνωρίσιμο.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation>Η σύνοψη MD5 είναι εντάξει</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation>Το αρχείο firmware δεν ταιριάζει με την επιλεγμένη συσκευή.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation>Γίνεται descrambling στο αρχείο</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation>Σφάλμα διαδικασίας descramble: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation>Λήψη αρχείου bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation>Προσθήκεη bootloader στο αρχείο firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation>Αδύνατο άνοιγμα αρχείο εισόδου</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation>Αποτυχία ανάγνωσης της κεφαλίδας</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation>Αποτυχια ανάγνωσης του firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation>Αδύνατο το άνοιγμα του αρχείου bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation>Αποτυχία ανάγνωσης του αρχείου bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation>Αδύνατο άνοιγμα αρχείο εξόδου</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation>Αποτυχία εγγραφής αρχείου εξόδου</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation>Σφάλμα διαδικασίας patching: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation>Σφάλμα διαδικασίας scramble: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation>Έλεγχος τροποποιημένου αρχείου firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation>Σφάλμα: το άθροισμα ελέγχου του τροποποιημένου αρχείου είναι λάθος</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation>Επιτυχία: Τροποποιημένο αρχείο firmware δημιουργήθηκε</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation>Αδύνατο άνοιγμα αρχείο εισόδου</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation>Αδύνατο άνοιγμα αρχείο εξόδου</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation>Μη έγκυρο αρχείο: λάθος μήκος κεφαλίδας</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation>Μη έγκυρο αρχείο: μη αναγνωρίσιμη κεφαλίδα</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation>Μη έγκυρο αρχείο: λάθος πεδίο &quot;μήκους&quot;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation>Μη έγκυρο αρχείο: λάθος πεδίο &quot;μήκους2&quot;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation>Μη έγκυρο αρχείο: λάθος εσωτερικό άθροισμα ελέγχου</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation>Μη έγκυρο αρχείο: λάθος πεδίο &quot;μήκους3&quot;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation>Άγνωστο</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished">Η εγκατάσταση του bootloader απαιτεί την παροχή ενός firmware αρχείου από το αυθεντικό firmware (αρχείο hex). Χρειάζεται να κάνετε λήψη αυτού του αρχείου μόνοι σας για λόγους νομιμότητας. Παρακαλώ δείτε &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;τις οδηγίες χρήσης&lt;/a&gt; και την σελίδα &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; για τον τρόπο όπου μπορείτε να αποκτήσετε αυτό το αρχείο.&lt;br/&gt;Πατήστε OK για να συνεχίστε και να αναζητήσετε στον υπολογιστή σας το αρχείο firmware.</translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>Σφάλμα: αδύνατη κατανομή buffer μνήμης!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation>Δεν βρέθηκε Ipod
 Ανεπαρκή δικαιώματα προσπέλασης δίσκου!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation>Δεν βρέθηκε Ipod!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation>Προσοχή, η συσκευή σας δουλεύει σαν MacPod, το Rockbox δεν το υποστηρίζει. Μετατρέψτε το σε WinPod.
 Βλέπετε http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation>Λήψη αρχείου bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation>Αποτυχία ανάγνωσης του φακέλου που βρίσκεται το firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation>Άγνωστος αριθμός έκδοσης firmware (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation>Αδύνατη η προσπέλαση του ipod με τρόπο RW</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation>Επιτυχής προσθήκη bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation>Αποτυχία προσθήκης bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation>Δεν ανιχνεύθηκε bootloader.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation>Επιτυχής κατάργηση bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation>Η κατάργηση του  bootloader απέτυχε.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation>Αδύνατο το άνοιγμα του ipod</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation>Αδύνατη η ανάγνωση του πίνακα κατάτμησης</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation>Δεν υπάρχει τμήμα firmware στο δίσκο</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished">Εγκατάσταση Rockbox bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -427,49 +432,34 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>Σφάλμα: αδύνατη κατανομή buffer μνήμης!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation>Αναζήτηση συσκευών sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation>Ανεπαρκή δικαιώματα προσπέλασης δίσκου!
 Απαιτούνται κατάλληλα δικαιώματα για την εγκατάσταση του bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation>Δεν βρέθηκαν συσκευές sansa!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation>Λήψη αρχείου bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation>Αδύνατο το άνοιγμα του sansa</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation>Αδύνατη η ανάγνωση του πίνακα κατάτμησης</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation>Ο δίσκος δεν είναι sansa (%1), ματαίωση.</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -481,67 +471,67 @@ See http://www.rockbox.org/wiki/SansaE200Install
 Βλέπετε http://www.rockbox.org/wiki/SansaE200Install</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation>Αδύνατη η προσπέλαση του sansa με τρόπο R/W</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation>Επιτυχής εγκατάσταση bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation>Αποτυχία εγκατάστασης bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation>Δεν βρέθηκε συσκευή sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation>Αδύνατο το άνοιγμα του sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation>Αδύνατη η ανάγνωση του πίνακα κατάτμησης</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation>Ο δίσκος δεν είναι sansa (%1), ματαίωση.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation>Επιτυχής κατάργηση bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation>Η κατάργηση του  bootloader απέτυχε.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished">Εγκατάσταση Rockbox bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -572,150 +562,150 @@ See http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>Η γλώσσα άλλαξε</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>Πρέπει να επανεκκινήσετε την εφαρμογή για να ενεργοποιηθεί η αλλαγή γλώσσας.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Το μέγεθος της τρέχουσας προσωρινής μνήμης είναι %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation>Ρυθμίσεις εντάξει</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation>Μη επιτρεπτές ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation>Επιλέξτε τη συσκευή σας</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>Βρέθηκε sansa e200 σε κατάσταση MTP!
 Πρέπει να αλλάξετε τη συσκευή σας σε κατάσταση MSC για την εγκατάσταση.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation>Βρέθηκε H10 20GB σε κατάσταση MTP!
 Πρέπει να αλλάξετε τη συσκευή σας σε κατάσταση UMS για την εγκατάσταση.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation>Αν δεν το αλλάξετε αυτό η εγκατάσταση θα αποτύχει!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation>Κρίσιμο σφάλμα</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation>Εντοπίστηκε μια ανυποστήρικτη %1 παραλλαγή συσκευής. Συγγνώμη, το Rockbox δεν μπορεί να εγκατασταθεί στη συσκευή σας.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation>Κρίσιμο σφάλμα: Βρέθηκε ανυποστήρικτη συσκευή</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>Αυτόματος εντοπισμός</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Δεν εντοπίστηκε κάποιο σημείο προσάρτησης.
 Επιλέξτε το σημείο προσάρτησης χειροκίνητα.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Δεν εντοπίστηκε κάποια συσκευή.
 Επιλέξτε τη συσκευή σας και το σημείο προσάρτησης χειροκίνητα.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>Σίγουρα διαγραφή προσωρινής μνήμης;</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Θέλετε σίγουρα να διαγραφεί η προσωρινή μνήμη; Κάντε απόλυτα σίγουρο ότι αυτή η επιλογή είναι σωστή καθώς θα αφαιρεθούν &lt;b&gt;όλα&lt;/b&gt; τα αρχεία και οι φάκελοι!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>Λάθος διαδρομή!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>Η διαδρομή της προσωρινής μνήμης δεν είναι επιτρεπτή. Ακύρωση.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation type="unfinished">Σφάλμα ρυθμίσεων</translation>
     </message>
@@ -924,7 +914,7 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Ελληνικά</translation>
@@ -981,57 +971,83 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Επιλεγμένη μηχανή TTS: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Επιλεγμένος κωδικοποιητής: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Ρυθμίσεις</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
-        <translation>Παραμετροποίηση κωδικοποιητή</translation>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
-        <translation>Διαδρομή κωδικοποιητή</translation>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>Ανα&amp;ζήτηση</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation>Επιλογές κωδικοποιητή</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Επαναφορά προεπιλογών</translation>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;ΟΚ</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>Ά&amp;κυρο</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1052,37 +1068,32 @@ Select your device and Mountpoint manually.</source>
         <translation>Έναρξή αντίγραφου ασφαλείας...</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation>Αντίγραφο ασφαλείας δημιουργήθηκε με επιτυχία</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation>Αποτυχία αντίγραφου ασφαλείας!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation>Αυτή είναι η απόλυτα ενημερωμένη, μέχρι λεπτού έκδοση Rockbox.  Η τωρινή έκδοση θα ενημερώνεται κάθε φορά που γίνεται κάποια αλλαγή. Η  τελευταία έκδοση είναι r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>Αυτή είναι η τελευταία &lt;b&gt;επίσημη&lt;/b&gt; έκδοση του Rockbox.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Σημείωση:&lt;/b&gt;Η τελευταία &lt;b&gt;επίσημη&lt;/b&gt; έκδοση είναι %1. &lt;b&gt;Αυτή είναι η συνιστούσα &lt;b&gt;επίσημη&lt;/b&gt; έκδοση.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation>Αυτές οι εκδόσεις δημιουργούνται καθημερινά από τον τρέχων πηγαίο κώδικα. Συνήθως εμπεριέχουν περισσότερα χαρακτηριστικά από ότι η τελευταία &lt;b&gt;επίσημη&lt;/b&gt; έκδοση αλλά ίσως είναι περισσότερο ασταθείς. Τα χαρακτηριστικά μπορεί να αλλάζουν τακτικά.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;Σημείωση:&lt;/b&gt; Η καθημερινή έκδοση είναι r%1 (%2).</translation>
     </message>
@@ -1097,15 +1108,20 @@ Select your device and Mountpoint manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1276,17 +1292,17 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>Ο φάκελος για ομιλία είναι λάθος!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Επιλεγμένη μηχανή TTS: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Επιλεγμένος κωδικοποιητής: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1320,12 +1336,12 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation>&amp;ΟΚ</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>&amp;Ματαίωση</translation>
     </message>
@@ -1333,389 +1349,336 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation>Επισκέπτης</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation>Διαχειριστής</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation>Χρήστης</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation>(δεν υπάρχει διαθέσιμη περιγραφή)</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Ανεπαρκή δικαιώματα για την εγκατάσταση του bootloader.
 Απαιτούνται δικαιώματα διαχειριστή.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Βρέθηκε αναντιστοιχία συσκευών.
 Εγκατεστημένη συσκευή: %1, επιλεγμένη συσκευή: %2.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation>Εντοπίστηκε πρόβλημα:</translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Ρυθμίσεις</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation>Παραμετροποίηση κωδικοποιητή RbSpeex</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation>Ένταση</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation>Περιορισμένη ζώνη</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation>Ποιότητα</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation>Πολυπλοκότητα</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation>Επαναφορά προεπιλογών</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;ΟΚ</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation>Ά&amp;κυρο</translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>Αρχείο</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>Έκδοση</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation>Νέα εγκατάσταση</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Αυτή είναι μια καινούργια εγκατάσταση του Rockbox Utility ή πρόκειται για μια νέα έκδοση. Το παράθυρο ρυθμίσεων θα εμφανισθεί τώρα για να σας επιτρέψει να παραμετροποιήσετε το πρόγραμμα ή να δείτε ξανά τις ρυθμίσεις σας. </translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation>Σφάλμα ρυθμίσεων</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Οι ρυθμίσεις σας δεν είναι έγκυρες. Πιθανότατα αυτό συμβαίνει λόγο αλλαγής διαδρομής της συσκευής. Το παράθυρο ρυθμίσεων θα εμφανισθεί τώρα για να σας επιτρέψει να διορθώσετε το πρόβλημα.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>Σφάλμα δικτύου: %1. Παρακαλώ ελέγξτε τις ρυθμίσεις δικτύου.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Εγχειρίδιο μορφής PDF&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Εγχειρίδιο μορφής HTML (ανοίγει σε πλοηγό)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>Επιλέξτε συσκευή για ένα σύνδεσμο για το σωστό εγχειρίδιο</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Περίληψη εγχειριδίου&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>Επαλήθευση εγκατάστασης</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Το σημείο προσάρτησης είναι λάθος!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation>Ματαιώθηκε!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation>Εντοπίστηκε εγκατάσταη Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation>Εντοπίστηκε εγκατάσταση του Rockbox. Θέλετε ένα αντίγραφο ασφαλείας πρώτα;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation>Έναρξη αντίγραφου ασφαλείας...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation>Επιτυχία αντίγραφου ασφαλείας</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation>Αποτυχία αντίγραφου ασφάλειας!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>Θέλετε σίγουρα να εγκαταστήσετε το bootloader;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>Θέλετε σίγουρα να εγκαταστήσετε το πακέτο γραμματοσειρών;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation>Προσοχη</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation>Η εφαρμογή λαμβάνει ακόμα πληροφορίες για καινούργιες εκδόσεις. Παρακαλώ προσπαθήστε ξανά σύντομα.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>Θέλετε σίγουρα να εγκαταστήσετε το αρχείο φωνής;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation>Η συσκευή σας δεν διαθέτει το plugin doom. Ματαίωση.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>Θέλετε σίγουρα να εγκαταστήσετε τα αρχεία πρόσθετων παιχνιδιών;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>Επαλήθευση απεγκατάστασης</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Θέλετε σίγουρα να απεγκαταστήσετε το bootloader;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>Επαλήθευση λήψης</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>Θέλετε σιγουρα να λάβετε το εγχειρίδιο; Το εγχειρίδιο θα αποθηκευθεί στον αρχικό φάκλεο της συσκευής σας.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>Επαλήθευση εγκατάστασης</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Θέλετε σίγουρα να εγκαταστήσετε το Rockbox Utility στη συσκευή σας; Μετά την εγκατάσταση θα μπορείτε να το τρέξετε από το σκληρό δίσκο της συσκευής σας.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>Εγκατάσταση Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Σφάλμα εγκατάστασης Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>Εγκατάσταση ρυθμίσεων χρήστη</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>Σφάλμα εγκατάστασης ρυθμίσεων χρήστη</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Επιτυχία εγκατάστασης Rockbox Utility.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Οι ρυθμίσεις σας δεν είναι έγκυρες. Παρακαλώ δείτε το παράθυρο ρυθμίσεων και σιγουρευτείτε ότι οι επιλεγμένες τιμές είναι σωστές.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation>Σφάλμα δικτύου</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation>Αδύνατη λήψη πληροφοριών έκδοσης.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation>Σίγουρα θέλετε να συνεχίσετε;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation>Δεν είναι γνωστή κάποια μέθοδος εγκατάστασης.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation>Ανιχνεύθηκε bootloader</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation>Ο bootloader είναι ήδη εγκατεστημένος. Θέλετε να επανεγκαταστήσετε το bootloader;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation>Δημιουργία αντίγραφου ασφαλείας του bootloader</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation>Μπορείτε να δημιουργήσετε ένα αντίγραφο ασφαλείας του αυθεντικού bootloader. Πατήστε &quot;Ναι&quot; για να επιλέξετε έναν φάκελο στον υπολογιστή σας για να σώσετε το αρχείο. Το αρχείο θα τοποθετηθεί σε έναν νέο φάκελο &quot;%1&quot; δημιουργώντας τον παρακάτω επιλεγμένο φάκελο.
 Πατήστε &quot;Όχι&quot; για να παραλείψετε αυτό το βήμα.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation>Αναζήτηση φακέλου αντίγραφου ασφαλείας</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation>Προϋποθέσεις</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>Η εγκατάσταση του bootloader απαιτεί την παροχή ενός firmware αρχείου από το αυθεντικό firmware (αρχείο hex). Χρειάζεται να κάνετε λήψη αυτού του αρχείου μόνοι σας για λόγους νομιμότητας. Παρακαλώ δείτε &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;τις οδηγίες χρήσης&lt;/a&gt; και την σελίδα &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; για τον τρόπο όπου μπορείτε να αποκτήσετε αυτό το αρχείο.&lt;br/&gt;Πατήστε OK για να συνεχίστε και να αναζητήσετε στον υπολογιστή σας το αρχείο firmware.</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation>Επιλέξτε αρχείο firmware</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation>Σφάλμα ανοίγματος αρχείου firmware</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation>Σφάλμα αντίγραφου ασφαλείας!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation>Δεν ήταν δυνατή η δημιουργία αντίγραφου ασφαλείας. Συνέχεια;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation>Απαιτούνται χειροκίνητα βήματα</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation>Δεν είναι γνωστή κάποια μέθοδος εγκατάστασης.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1724,7 +1687,7 @@ This will install Rockbox %1. To install the most recent development build avail
 Θα εγκατασταθεί το Rockbox %1. Για να εγκαταστήσετε την πιο ενημερωμένη έκδοση που υπάρχει πατήστε &quot;Άκυρο&quot; και χρησιμοποιήστε την καρτέλα &quot;Εγκατάσταση&quot;.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1733,12 +1696,12 @@ This will install Rockbox %1. To install the most recent development build avail
 Θα εγκατασταθεί το Rockbox %1. Για να εγκαταστήσετε την πιο ενημερωμένη έκδοση που υπάρχει πατήστε &quot;Άκυρο&quot; και χρησιμοποιήστε την καρτέλα &quot;Εγκατάσταση&quot;.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2149,59 +2112,6 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Ρυθμίσεις</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Παραμετροποίηση μηχανής TTS</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation>Γλώσσα</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation>Φωνή</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation>Ταχύτητα</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation>Επιλογές TTS</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation>Επαναφορά προεπιλογών</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;ΟΚ</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation>Ά&amp;κυρο</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation>Χρήση Sapi 4</translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2260,150 +2170,86 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation>Δεν βρέθηκε εκτελέσιμο μηχανής TTS</translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Ρυθμίσεις</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Παραμετροποίηση μηχανής TTS</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation>Διαδρομή μηχανής TTS</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>Ανα&amp;ζήτηση</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
-        <translation>Επιλογές TTS</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Επαναφορά προεπιλογών</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;ΟΚ</translation>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>Ά&amp;κυρο</translation>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Ρυθμίσεις</translation>
-    </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
+        <translation>Δεν ήταν δυνατή η αντιγραφή του Sapi-script</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
+        <translation>Δεν ήταν δυνατή η εκκίνηση του Sapi-script</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished">&amp;Ανανέωση</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TTSSapi</name>
-    <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
-        <translation>Δεν ήταν δυνατή η αντιγραφή του Sapi-script</translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
-        <translation>Δεν ήταν δυνατή η εκκίνηση του Sapi-script</translation>
-    </message>
-</context>
-<context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation>Εκκίνηση δημιουργίας αρχείου ομιλίας</translation>
     </message>
@@ -2413,62 +2259,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation>Η αρχικοποίηση της μηχανής TTS απέτυχε</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation>Η αρχικοποίηση του κωδικοποιητή απέτυχε</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation>Ανάγνωση λίστας αρχείων...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation>Η δημιουργία αρχείου ομιλίας ματαιώθηκε</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation>Εκφώνηση καταχωρήσεων...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation>Κωδικοποίηση αρχείων...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation>Αντιγραφή αρχείου ομιλίας φακέλων...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation>Αντιγραφή αρχείου ομιλίας αρχείων...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation>Η δημιουργία αρχείων ομιλίας ολοκληρώθηκε</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation>Η κωδικοποίηση του %1 απέτυχε</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Η αντιγραφή του %1 στο %2 απέτυχε</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation>Καθαρισμός..</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2514,91 +2360,91 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>Δεν υπάρχει επιλεγμένο θέμα</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Σφάλμα δικτύου: %1.
 Παρακαλώ ελέγξτε τις ρυθμίσεις δικτύου.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation>Εμφανίσθηκε το παρακάτω σφάλμα:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>Ολοκληρώθηκε.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>Λήψη λεπτομερειών για %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>Λήψη προεπισκόπησης...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Συντάκτης:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>Άγνωστο</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Έκδοση:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Περιγραφή:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>Δεν υπάρχει περιγραφή</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>Δεν υπάρχει προεπισκόπηση θέματος</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>Λήψη πληροφοριών θέματος...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>Το σημείο προσάρτησης είναι λάθος!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -2606,7 +2452,7 @@ Please check your network and proxy settings.</source>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -2615,87 +2461,87 @@ HTTP response code: %1</source>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>Η διεργασία ZIP ολοκληρώθηκε με επιτυχία.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>Αποτυχία αρχικοποίησης ή φόρτωσης βιβλιοθήκης zlib.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>Σφάλμα βιβλιοθήκης zlib.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>Αδύνατη δημιουργία ή άνοιγμα αρχείου.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>Το συμπιεσμένο αρχείο είναι εν μέρει κατεστραμμένο. Μερικά αρχεία μπορεί να μην εξαχθούν.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>Κατεστραμμένο συμπιεσμένο αρχείο.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>Λάθος κωδικός.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>Δεν έχει δημιουργηθεί συμπιεσμένο αρχείο ακόμα.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>Το αρχείο ή ο φάκελος δεν υπάρχει.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>Σφάλμα ανάγνωσης αρχείου.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>Σφάλμα εγγραφής αρχείου.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>Σφάλμα αναζήτησης στο αρχείο.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>Αδύνατη δημιουργία ή άνοιγμα αρχείου.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>Μη έγκυρη συσκευή.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>Μη έγκυρο ή μη συμβατό συμπιεσμένο αρχείο zip.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation>Μη έγκυρη κεφαλίδα. Το συμπιεσμένο αρχείο μπορεί να ειναι κατεστραμμένο.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>Άγνωστο σφάλμα.</translation>
     </message>
@@ -2779,37 +2625,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation>Εκκίνηση δημιουργίας αρχείου φωνής</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Σφάλμα λήψης: σφάλμα HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation>Χρησιμοποιήθηκε προσωρινά αποθηκευμένο αρχείο.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation>Σφάλμα λήψης: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation>Η λήψη ολοκληρώθηκε.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation>Το άνοιγμα του ληφθέν αρχείου απέτυχε</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation>Η αρχικοποίηση της μηχανής TTS απέτυχε</translation>
     </message>
@@ -2844,7 +2690,7 @@ HTTP response code: %1</source>
         <translation>Επιτυχής δημιουργία.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2905,72 +2751,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>Ολοκληρώθηκε.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>Η εγκατάσταση ολοκληρώθηκε με επιτυχία.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>Λήψη αρχείου %1. %2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Σφάλμα λήψης: σφάλμα HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>Χρήση αρχείου προσωρινής μνήμης.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>Σφάλμα λήψης: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>Η λήψη ολοκληρώθηκε.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>Εξαγωγή αρχείου.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>Άνοιγμα συμπιεσμένου αρχείου απέτυχε: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>Η εξαγωγή απέτυχε: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>Εγκατάσταση αρχείου.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>Εγκατάσταση αρχείου απέτυχε.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>Δημιουργία αρχείου καταγραφής εγκατάστασης</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Δεν υπάρχει αρκετός χώρος στο δίσκο. Ματαίωση.</translation>
     </message>
@@ -2998,12 +2844,12 @@ HTTP response code: %1</source>
         <translation>&amp;Συντελεστές</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>&amp;Άδεια χρήσης</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>&amp;ΟΚ</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_he.ts b/rbutil/rbutilqt/lang/rbutil_he.ts
index c1db24c5b6..06a7db1f57 100644
--- a/rbutil/rbutilqt/lang/rbutil_he.ts
+++ b/rbutil/rbutilqt/lang/rbutil_he.ts
@@ -134,250 +134,255 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation type="unfinished">לא ידוע</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -425,48 +430,33 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -475,67 +465,67 @@ See http://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -566,150 +556,150 @@ See http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation type="unfinished">שפה השתנתה</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation type="unfinished">עליך להפעיל מחדש את התוכנה על מנת שהשפה שהשתנתה תכנס לתוקף.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation type="unfinished">גודל זכרון מטמון נוכחי הוא %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation type="unfinished">ההגדרות תקינות</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation type="unfinished">ההגדרות אינן תקינות</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation type="unfinished">בחר את ההתקן שלך</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished">נמצא נגן Sansa e200 במצב MTP!
 עליך לשנות את מצב הנגן למצב MSC על מנת להתקין.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation type="unfinished">נמצא נגן H10 20GB במצב MTP!
 עליך לשנות את מצב הנגן למצב UMS על מנת להתקין.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation type="unfinished">ההתקנה תכשל אם לא שינית זאת!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation type="unfinished">טעות קריטית</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished">זוהה נגן מסוג %1 שאינו נתמך. רוקבוקס אינה יכולה לרוץ על נגן זה.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation type="unfinished">טעות קריטית: נמצא נגן שאינו נתמך</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation type="unfinished">זיהוי אוטומאטי</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation type="unfinished">לא מזהה נקודת עגינה.
 בחר את נקודת העגינה ידנית.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation type="unfinished">לא מזהה נגן.
 בחר את הנגן ונקודת העגינה ידנית.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation type="unfinished">באמת למחוק את המטמון?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation type="unfinished">האם באמת ברצונך למחוק את המטמון? היה בטוח לגמרי שהגדרה זו הינה נכונה, כיוון שהיא תמחק את &lt;b&gt;כל&lt;/b&gt; הקבצים בספרייה זו!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation type="unfinished">נתיב שגוי!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation type="unfinished">נתיב זכרון המטמון שגוי. מבטל.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation type="unfinished">שגיאת הגדרות</translation>
     </message>
@@ -915,7 +905,7 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation type="unfinished">עברית</translation>
@@ -972,57 +962,83 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished">בחר מנוע דיבור: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished">בחר מקודד: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">הגדרות</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
-        <translation type="unfinished">הגדר מקודד</translation>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
-        <translation type="unfinished">נתיב למקודד</translation>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;עיין</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation type="unfinished">אפשרויות מקודד</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation type="unfinished">אפס</translation>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;אישור</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;ביטול</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1043,37 +1059,32 @@ Select your device and Mountpoint manually.</source>
         <translation type="unfinished">מתחיל גיבוי...</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation type="unfinished">הגיבוי הסתיים בהצלחה</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation type="unfinished">הגיבוי נכשל!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation type="unfinished">זוהי העדכנית ביותר של רוקבוקס הקיימת. בכל פעם שנעשה שינוי לקוד המקור, גירסה זו מתעדכנת. הגירסה האחרונה הינה r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation type="unfinished">זוהי הגרסה האחרונה של רוקבוקס.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;שים לב:&lt;/b&gt; הגרסה האחרונה ששוחררה היא %1. &lt;b&gt;זוהי הגרסה המומלצת.&lt;/b&gt; </translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation type="unfinished">גרסאות אלו נבנות אוטומאטית בכל יום מקוד המקור העדכני. לגרסאות אלו תכונות רבות יותר מהגרסה היציבה, אך מאידך הן עלולות להיות יציבות פחות. תכונות עשויות להשתנות לעיתים קרובות.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation type="unfinished">&lt;b&gt;שים לב:&lt;/b&gt; גרסת הארכיב היא r%1 (%2).</translation>
     </message>
@@ -1088,15 +1099,20 @@ Select your device and Mountpoint manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1267,17 +1283,17 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation type="unfinished">הספרייה להקריא הינה שגוייה!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished">מנוע הדיבור שנבחר: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished">המקודד שנבחר: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1311,12 +1327,12 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation type="unfinished">&amp;אישור</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation type="unfinished">&amp;ביטול</translation>
     </message>
@@ -1324,405 +1340,352 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation type="unfinished">אורח</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation type="unfinished">מנהל</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation type="unfinished">משתמש</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation type="unfinished">שגיאה</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation type="unfinished">(אין תיאור זמין)</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">הגדרות</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation type="unfinished">הגדר את מקודד RbSpeex</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation type="unfinished">עוצמת קול</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation type="unfinished">פס צר</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation type="unfinished">איכות</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation type="unfinished">מורכבות</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation type="unfinished">איפוס</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;אישור</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;ביטול</translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation type="unfinished">קובץ</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation type="unfinished">גרסה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation type="unfinished">התקנה חדשה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation type="unfinished">זוהי התקנה חדשה של תוכנת השירות של רוקבוקס, או גרסה חדשה. תיבת השיח של ההגדרות תיפתח כעת על מנת לאפשר לך להגדיר את התוכנית, או לעבור על ההגדרות הקיימות.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation type="unfinished">שגיאת הגדרות</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation type="unfinished">ההגדרות שלך שגויות. לרוב הדבר נובע מכך שהנתיב לנגן השתנה. תיבת השיח של ההגדרות תיפתח כעת, על מנת לאפשר לך לתקן את הבעיה.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished">שגיאת רשת: %1. אנא בדוק את הגדרות הרשת והפרוקסי שלך.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;%1 %2&lt;/b&gt; ב- &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;מדריך PDF&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;מדריך HTML (נפתח בדפדפן)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation type="unfinished">בחר בנגן בשביל קישור למדריך המשתמש המתאים</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;תקציר המדריך&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation type="unfinished">אשר התקנה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation type="unfinished">נקודת העיגון הינה שגויה!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation type="unfinished">בוטל!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation type="unfinished">זוהתה התקנה של רוקבוקס</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation type="unfinished">זוהתה התקנה של רוקבוקס. האם ברצונך לגבות לפני כן?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation type="unfinished">מתחיל גיבוי...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation type="unfinished">הגיבוי הסתיים בהצלחה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation type="unfinished">הגיבוי נכשל!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation type="unfinished">האם באמת ברצונך להתקין את מנהל האיתחול?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation type="unfinished">האם באמת ברצונך להתקין את חבילת הגופנים?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation type="unfinished">אזהרה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation type="unfinished">תוכנית השרות עדיין מורידה מידע לגבי גרסאות חדשות. אנא נסה שוב בקרוב.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation type="unfinished">האם באמת ברצונך להתקין את קובץ הקראת התפריטים?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation type="unfinished">שגיאה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation type="unfinished">לנגן שברשותך אין הרחבת doom. מבטל.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation type="unfinished">האם באמת ברצונך להתקין את קבצי הרחבות המשחקים?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation type="unfinished">אשר הסרת התקנה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation type="unfinished">האם באמת ברצונת להסיר את מנהל האיתחול?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation type="unfinished">אשר הורדה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation type="unfinished">האם באמת ברצונך להוריד את מדריך המשתמש? המדריך יישמר בספרייה הראשית של הנגן שלך.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation type="unfinished">אשר התקנה</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation type="unfinished">האם באמת ברצונך להתקין את תוכנית השרות של רוקבוקס לנגן שלך? לאחר ההתקנה תוכל להריץ אותה מהתקן האיחסון של הנגן.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation type="unfinished">מתקין את תוכנת השרות של רוקבוקס</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation type="unfinished">שגיאה בהתקנת תוכנת השרות של רוקבוקס</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation type="unfinished">מתקין הגדרות משתמש</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation type="unfinished">שגיאה בהתקנת הגדרות משתמש</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation type="unfinished">התקנת תוכנית השרות של רוקבוקס הסתיימה בהצלחה.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation type="unfinished">ההגדרות שלך שגויות. אנא עבור לתיבת השיח של ההגדרות וודא שהערכים הנכונים נבחרו.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2132,59 +2095,6 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">הגדרות</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation type="unfinished">הגדר מנוע דיבור</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation type="unfinished">שפה</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation type="unfinished">קול</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation type="unfinished">מהירות</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation type="unfinished">אפשרויות דיבור</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation type="unfinished">איפוס</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;אישור</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;ביטול</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation type="unfinished">השתמש ב- Sapi 4</translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2243,150 +2153,86 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation type="unfinished">קובץ הפעלה של הדיבור לא נמצא</translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">הגדרות</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation type="unfinished">הגדר מנוע דיבור</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation type="unfinished">נתיב למנוע דיבור</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;עיין</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
-        <translation type="unfinished">אפשרויות דיבור</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation type="unfinished">איפוס</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;אישור</translation>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;ביטול</translation>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">הגדרות</translation>
-    </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
+        <translation type="unfinished">לא מצליח להעתיק את Sapi-script</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
+        <translation type="unfinished">לא מצליח להפעיל את Sapi-script</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished">&amp;ריענון</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TTSSapi</name>
-    <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
-        <translation type="unfinished">לא מצליח להעתיק את Sapi-script</translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
-        <translation type="unfinished">לא מצליח להפעיל את Sapi-script</translation>
-    </message>
-</context>
-<context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation type="unfinished">מתחיל ביצירת קובץ הקראת התפריטים</translation>
     </message>
@@ -2396,62 +2242,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished">איתחול מנוע הדיבור נכשל</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation type="unfinished">איתחול מנוע המקודד נכשל</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation type="unfinished">קורא רשימת קבצים...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation type="unfinished">יצירת קובץ הקראת התפריטים בוטלה</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation type="unfinished">מקודד קבצים...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation type="unfinished">מעתיק קובץ הקראה לספריות...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation type="unfinished">מעתיק קובץ הקראה לקבצים...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation type="unfinished">יצירת קבצי הקראה הסתיימה</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation type="unfinished">הקידוד של %1 נכשל</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation type="unfinished">העתקת %1 ל- %2 נכשלה</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation type="unfinished">מנקה..</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2497,91 +2343,91 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation type="unfinished">לא נבחרה ערכת נושא</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation type="unfinished">תקלת רשת: %1.
 אנא בדוק את הגדרות הרשת והפרוקסי שלך.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation type="unfinished">השגיאה הבאה התרחשה:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation type="unfinished">סיום.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation type="unfinished">מושך פרטים עבור %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation type="unfinished">מושך תצוגה מקדימה...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation type="unfinished">&lt;b&gt;יוצר:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation type="unfinished">לא ידוע</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation type="unfinished">&lt;b&gt;גירסה:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation type="unfinished">&lt;b&gt;תיאור:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation type="unfinished">אין תיאור</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation type="unfinished">אין תצוגה מקדימה של ערכת נושא</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation type="unfinished">מושך מידע על ערכות הנושא...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation type="unfinished">נקודת העיגון שגויה!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -2589,7 +2435,7 @@ Please check your network and proxy settings.</source>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -2598,87 +2444,87 @@ HTTP response code: %1</source>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation type="unfinished">פעולת הכיווץ הושלמה בהצלחה.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation type="unfinished">כשלון בטעינת ספריית zlib.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation type="unfinished">שגיאה בספריית zlib.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation type="unfinished">לא מצליח ליצור או לפתוח קובץ.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation type="unfinished">קובץ ארכיב פגום בחלקו. יתכן וחלק מהקבצים חולצו.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation type="unfinished">קובץ ארכיב פגום.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation type="unfinished">סיסמה שגויה.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation type="unfinished">עדיין לא נוצר קובץ ארכיב.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation type="unfinished">קובץ או ספרייה לא קיימים.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation type="unfinished">שגיאה בקריאת קובץ.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation type="unfinished">שגיאה בכתיבת קובץ.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation type="unfinished">שגיאה בחיפוש בקובץ.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation type="unfinished">לא מצליח ליצור ספרייה.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation type="unfinished">התקן לא תקין.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation type="unfinished">קובץ ארכיב לא תקין או לא תואם.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation type="unfinished">כותרות לא אחידות. קובץ ארכיב עשוי להיות פגום.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation type="unfinished">שגיאה לא ידועה.</translation>
     </message>
@@ -2762,37 +2608,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation type="unfinished">מתחיל ביצירת קבצי הקראה</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">כשלון בהורדה: התקבלה שגיאת HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation type="unfinished">נעשה שימוש בקובץ הנמצא במטמון.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation type="unfinished">שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation type="unfinished">הורדה הסתיימה.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation type="unfinished">פתיחת הקובץ שירד נכשלה</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation type="unfinished">איתחול מנוע הדיבור נכשל</translation>
     </message>
@@ -2827,7 +2673,7 @@ HTTP response code: %1</source>
         <translation type="unfinished">נוצר בהצלחה.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2888,72 +2734,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation type="unfinished">סיום.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation type="unfinished">התקנה הסתיימה בהצלחה.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation type="unfinished">מוריד קובץ %1.%2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">שגיאת הורדה: התקבלה שגיאת HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation type="unfinished">נעשה שימוש בקובץ מהמטמון.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation type="unfinished">שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation type="unfinished">הורדה הסתיימה.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation type="unfinished">פורס קובץ.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation type="unfinished">פתיחת קובץ ארכיב נכשלה: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation type="unfinished">פריסה נכשלה: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation type="unfinished">מתקין קובץ.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation type="unfinished">התקנת קובץ נכשלה.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation type="unfinished">יוצר קובץ רישום של ההתקנה</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2981,12 +2827,12 @@ HTTP response code: %1</source>
         <translation type="unfinished">&amp;תודות</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation type="unfinished">&amp;רישיון</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation type="unfinished">&amp;אישור</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_ja.ts b/rbutil/rbutilqt/lang/rbutil_ja.ts
index d94766ea32..deb6e5c502 100644
--- a/rbutil/rbutilqt/lang/rbutil_ja.ts
+++ b/rbutil/rbutilqt/lang/rbutil_ja.ts
@@ -134,152 +134,157 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation>ブートローダのインストールには、オリジナルのファームウェアを用意する必要があります(hex 形式)。法律上の問題のため、ファームウェアは、あなたがダウンロードする必要があります。&lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; および、どの様に、ファームウェアファイルを取得したらよいかに関した Wiki ページ&lt;a href=&apos;http://www.rockbox.org/twiki/bin/view/Main/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt;を参考にして下さい。&lt;br&gt;続行するために、OKボタンを押し、ファームウェアファイルを参照して下さい。</translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation>入力ファイルのMD5ハッシュ値をチェックしています...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation>オリジナルのファームウェアファイルの確認ができませんでした</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation>ファームウェアファイルが認識されません。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation>MD5ハッシュ値ok</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation>ファームウェアファイルは、選択されたプレイヤーに適合しません。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation>ファイルを復号しています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation>ファームウェアの復号処理時にエラーが発生しました: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation>ブートローダをダウンロードしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation>ファームウェアファイルにブートローダを追加しています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation>入力ファイルを開くことができませんでした</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation>ヘッダの読み込みに失敗しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation>ファームウェアの読み込みに失敗しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation>ブートローダが読み込めません</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation>ブートローダの読み込みに失敗しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation>出力ファイルが読み込めません</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation>出力ファイルの出力に失敗しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation>ファームウェアの変更時にエラーが発生しました: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation>ファームウェアの暗号化処理に失敗しました: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation>変更されたファームウェアをチェックしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation>エラー: 変更されたファームウェアのチェックサムの値が間違っています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation>成功: 変更されたファームウェアが作成されました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation>入力ファイルをオープンすることができません</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation>出力ファイルを開くことができません</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation>不正なファイル: ヘッダの長さが間違っています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation>不正なファイル: ヘッダが正しくありません</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation>不正なファイル: &quot;length&quot; の値が間違っています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation>不正なファイル: &quot;length2&quot; の値が間違っています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation>不正なファイル: ファームウェアに書かれたチェックサムの値が間違っています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation>不正なファイル: &quot;length3&quot; の値が間違っています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation>不明</translation>
     </message>
@@ -287,96 +292,96 @@
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>エラー: メモリの割り当てに失敗しました!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation>iPod が検出されませんでした
 このプレイヤーに対するディスクアクセスの権限がありません!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation>iPodが検出されませんでした!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation>注意: Macintosh 専用の iPod です。Rockbox は、Windows で使用できる iPod でしか動作しません。
 http://www.rockbox.org/wiki/IpodConversionToFAT32 を参照して下さい</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation>ブートローダをダウンロードしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation>ファームウェアのあるディレクトリの読み込みに失敗しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation>ファームウェアのバージョン(%1)が不明です</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation>iPod に読み書きできるようにアクセスすることができませんでした</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation>ブートローダの追加が成功しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation>ブートローダの追加に失敗しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation>ブートローダが検出されませんでした。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation>iPod にアクセスできませんでした</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation>パーティションテーブルを読み込めませんでした</translation>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation>パーティションテーブルの読み込みのエラー - iPod ではない可能性があります</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation>ファームウェアが存在しません</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation>ブートローダの削除が成功しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation>ブートローダの削除に失敗しました。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Rockboxのブートローダをインストールしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation>ブートローダをアンインストールしています</translation>
     </message>
@@ -427,49 +432,34 @@ http://www.rockbox.org/wiki/IpodConversionToFAT32 を参照して下さい</tran
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>エラー: メモリの割り当てに失敗しました!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation>Sansa を探しています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation>このプレイヤーに対するディスクアクセスの権限がありません!
 ブートローダのインストールには、ディスクアクセスの権限が必要です</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation>Sansa が検出されませんでした!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation>ブートローダをダウンロードしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation>Sansa にアクセスできませんでした</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation>パーティションテーブルを読み込めませんでした</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation>Sansa にディスクが見つかりませんでした (エラー: %1)。処理を中止します。</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -482,69 +472,69 @@ http://www.rockbox.org/wiki/SansaE200Install を参照して下さい
 </translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation>Sansa に読み書きできるようにアクセスすることができませんでした</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation>ブートローダのインストールに成功しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation>ブートローダのインストールに失敗しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation>Sansa が見つかりませんでした</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation>Sansa にアクセスできませんでした</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation>パーティションテーブルを読み込めませんでした</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation>Sansa にディスクが見つかりませんでした (エラー: %1)。処理を中止します。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation>ブートローダの削除が成功しました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation>ブートローダの削除に失敗しました。</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation>Rockboxのブートローダをインストールしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation>ブートローダをアンインストールしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
-        <translation type="unfinished"></translation>
+        <translation>ダウンロードしたブートローダをチェックしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
-        <translation type="unfinished"></translation>
+        <translation>ブートローダが正しくありません! 処理を中止します。</translation>
     </message>
 </context>
 <context>
@@ -573,150 +563,150 @@ http://www.rockbox.org/wiki/SansaE200Install を参照して下さい
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>表示言語の変更</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>表示言語を変更するには、Rockbox Utilityを再起動する必要があります。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>現在のキャッシュサイズは、%L1 kiB です。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation>設定OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation>不正な設定</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation>デバイスを選択して下さい</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>MTP モードの Sansa e200 が見つかりました。
 インストールするためには、MSC モードに変更する必要があります。 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation>MTP モードの H10 20GB が見つかりました。
 インストールするためには、UMS モードに変更する必要があります。 </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation>設定を変更しないと、インストールに失敗するでしょう!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation>致命的なエラー</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation>サポートされていないプレイヤー %1 が見つかりました。Rockbox は、このプレイヤーで動かすことができません。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation>致命的なエラー: 互換性のないプレイヤーが見つかりました</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>自動検出</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>マウントポイントが検出できませんでした。
 マウントポイントを手動で選択して下さい。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>デバイスが検出できませんでした。
 デバイスおよびマウントポイントを手動で選択して下さい。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>本当にキャッシュを削除していいですか?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>本当にキャッシュを削除しますか?  このフォルダに含まれる&lt;b&gt;全ての&lt;/b&gt;ファイルを削除しますので、絶対に正しい値を設定して下さい!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>パスが間違っています!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>キャッシュのパスが不正です。処理を中止します。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation>以下のエラーが発生しました:</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation>マウントポイントが入力されていません</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation>マウントポイントが存在しません</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation>マウントポイントがフォルダではありません。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation>マウントポイントが書き込み禁止です</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation>プレイヤーが選択されていません</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>キャッシュのパスが書き込み禁止です。デフォルトのシステムテンポラリパスを空にします。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation>処理を続行する前に、上記のエラーを修正する必要があります。</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation>設定エラー</translation>
     </message>
@@ -922,7 +912,7 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>日本語</translation>
@@ -979,57 +969,83 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>TTSエンジンの選択: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>エンコーダの選択: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>設定</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
-        <translation>エンコーダの設定</translation>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
-        <translation>エンコーダパス</translation>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>参照(&amp;B)</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation>エンコーダオプション</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>リセット</translation>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>Ok(&amp;O)</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation>エンコードエンジンを待っています...</translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>キャンセル(&amp;C)</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation>参照</translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation>リフレッシュ</translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation>実行可能の選択</translation>
     </message>
 </context>
 <context>
@@ -1037,7 +1053,7 @@ Select your device and Mountpoint manually.</source>
     <message>
         <location filename="../install.cpp" line="98"/>
         <source>Mount point is wrong!</source>
-        <translation>マウントポジションが間違っています!</translation>
+        <translation>マウントポイントが間違っています!</translation>
     </message>
     <message>
         <location filename="../install.cpp" line="143"/>
@@ -1050,37 +1066,37 @@ Select your device and Mountpoint manually.</source>
         <translation>バックアップの開始...</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation>バックアップが成功しました</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation>バックアップが失敗しました!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation>これは、最新版のRockboxです。最新版は毎日更新されます。現在のバージョンは、r%1 (%2) です。</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>これは、最新のリリース版のRockboxです。</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation>&lt;b&gt;注意:&lt;/b&gt;最新のリリース版は、%1です。 &lt;b&gt;これはお勧めのバージョンです。&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation>これらは毎日、現在の開発ソースコードから自動的に作成されます。 一般に最新の安定版より多くの機能を持っていますが、安定版より動作が安定していない可能性があります。 機能は頻繁に変わる可能性があります。</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;注意:&lt;/b&gt; 保存されているバージョンは、 r%1 (%2) です。</translation>
     </message>
@@ -1095,12 +1111,12 @@ Select your device and Mountpoint manually.</source>
         <translation>%1 をバックアップします</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation>バックアップファイルの選択</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation>&lt;b&gt;これはお勧めのバージョンです。&lt;/b&gt;</translation>
     </message>
@@ -1274,17 +1290,17 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>トークファイルを置くフォルダが間違っています!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>選択されたTTS エンジン: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>選択されたエンコーダ: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1318,12 +1334,12 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation>Ok(&amp;O)</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>中止(&amp;A)</translation>
     </message>
@@ -1331,389 +1347,336 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation>ゲスト</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation>管理者</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation>ユーザ</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation>(利用可能な記述がありません)</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>&lt;li&gt;ブートローダをインストールするのに、アクセス権限が足りません。
 管理者権限が必要です。&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>&lt;li&gt;検出されたターゲットが一致しません。
 インストールされているターゲット: %1, 選択されたターゲット: %2.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation>問題が見つかりました:</translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation>RbSpeex エンコーダの設定</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation>ボリューム</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation>ナローバンド</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation>クオリリティ</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation>複雑性</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation>リセット</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation>Ok(&amp;O)</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation>キャンセル(&amp;C)</translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>ファイル</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>バージョン</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation>新規インストール</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>これは、新規にインストール、または、新しいバージョンに更新された Rockbox Utility です。プログラムのセットアップを許可したり、または、設定を見直すために設定ダイアログが表示されることがあります。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation>設定エラー</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>設定が正しくありません。たぶん、デバイスのパスが変更されているのが原因です。問題を修正できるように、設定ダイアログが表示されます。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>ネットワークエラー: %1. ネットワークおよびプロキシーの設定を確認して下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%3&lt;/b&gt;の&lt;b&gt;%1 %2&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;PDF 形式のマニュアル&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;HTML 形式のマニュアル (ブラウザで開きます)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>正しいマニュアルへのリンクを指定するため、デバイスを選択して下さい</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Manual の概要&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>インストールの確認</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>マウントポイントが間違っています!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation>処理を中止します!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation>インストールされたRockbox を検出しました</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation>Rockbox がインストールされていることを検出しました。まずバックアップを行いますか? </translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation>バックアップを開始します...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation>バックアップが成功しました</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation>バックアップが失敗しました!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>ブートローダのインストールを本当に行いますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>フォントパッケージのインストールを本当に行いますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation>そのアプリケーションは、新規ビルドに対する情報をまだダウンロードしています。もう少し経ちましたら、再度行って下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>ボイスファイルのインストールを本当に行いますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation>デバイスには、Doom プラグインがありません。処理を中止します。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>ゲームのアドオンを本当にインストールしますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>アンインストールの確認</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>ブートローダのアンインストールを本当に行いますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>ダウンロードの確認</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>マニュアルのダウンロードを本当に行いますか? マニュアルは、プレイヤーのルートフォルダに保存されます。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>インストールの確認</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Rockbox Utilityをプレイヤーにインストールしてもいいですか? インストール後、プレイヤーのハードディスクから実行して下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>Rockbox Utilityをインストールしています</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Rockbox Utilityのインストール中にエラーが発生しました</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>ユーザ設定をインストールしています</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>ユーザ設定のインストール中にエラーが発生しました</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utilityのインストールが成功しました。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>設定が正しくありません。設定ダイアログを表示し、選択された値が正しいか確認して下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation>ネットワークエラー</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation>バージョン情報が取得できません。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation>インストール方法が不明です。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation>ブートローダが検出されました</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation>ブートローダは既にインストールされています。ブートローダをインストールしますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation>ブートローダのバックアップを作成します</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation>オリジナルのブートローダファイルのバックアップファイルを作成することができます。&quot;はい&quot;ボタンを押して、バックアップファイルを保存するためのフォルダを選択して下さい。選択されたフォルダの下に &quot;%1&quot; フォルダを作成し、バックアップファイルを作成します。
 &quot;いいえ&quot;ボタンを押しますと、バックアップファイルを作成しません。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation>バックアップフォルダの表示</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation>前提条件</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>ブートローダのインストールには、オリジナルのファームウェアを用意する必要があります(hex 形式)。法律上の問題のため、ファームウェアは、あなたがダウンロードする必要があります。&lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; および、どの様に、ファームウェアファイルを取得したらよいかに関した Wiki ページ&lt;a href=&apos;http://www.rockbox.org/twiki/bin/view/Main/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt;を参考にして下さい。&lt;br&gt;続行するために、OKボタンを押し、ファームウェアファイルを参照して下さい。</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation>ファームウェアを選択して下さい</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation>ファームウェア読み込み時のエラー</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation>バックアップエラー</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation>バックアップファイルが作成されませんでした。続行しますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation>手動で行う必要があります</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation>アンインストール方法が不明です。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation>本当に続行しますか?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1722,7 +1685,7 @@ This will install Rockbox %1. To install the most recent development build avail
 Rockbox %1 をインストールします。 最新の開発版をインストールするのであれば、&quot;キャンセル&quot;ボタンを押したのち、&quot;インストール&quot;タブを選択して下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1731,12 +1694,12 @@ This will install Rockbox %1. To install the most recent development build avail
 Rockbox %1 をインストールします。 最新の開発版をインストールするのであれば、&quot;キャンセル&quot;ボタンを押したのち、&quot;インストール&quot;タブを選択して下さい。</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation>ブートローダのインストールをスキップしました</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation>ブートローダのインストールが中止しました</translation>
     </message>
@@ -2146,59 +2109,6 @@ Rockbox %1 をインストールします。 最新の開発版をインスト�
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>TTS エンジンの設定</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation>言語</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation>ボイス</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation>速度</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation>TTS のオプション</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation>設定のリセット</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation>Ok(&amp;O)</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation>キャンセル(&amp;C)</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation>Sapi 4 の使用</translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2257,150 +2167,86 @@ Rockbox %1 をインストールします。 最新の開発版をインスト�
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation>実行可能な TTS が見つかりませんでした</translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>TTS エンジンの設定</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation>TTS エンジンのパス</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>参照(&amp;B)</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
-        <translation>TTS のオプション</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>リセット</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>Ok(&amp;O)</translation>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>キャンセル(&amp;C)</translation>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
-        <translation type="unfinished"></translation>
+        <translation>ボイス化する文字列が見つかりませんでした</translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
-        <translation type="unfinished"></translation>
+        <translation>利用可能な記述がありません</translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">設定</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
+        <translation>Sapi-script がコピーできませんでした</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
+        <translation>Sapi-script が実行できませんでした</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished">リフレッシュ(&amp;R)</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TTSSapi</name>
-    <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
-        <translation>Sapi-script がコピーできませんでした</translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
-        <translation>Sapi-script が実行できませんでした</translation>
-    </message>
-</context>
-<context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation>トークファイルエンジンを実行しています</translation>
     </message>
@@ -2410,64 +2256,64 @@ Rockbox %1 をインストールします。 最新の開発版をインスト�
         <translation>TTS エンジンの初期化に失敗しました</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation>エンコーダエンジンの初期化に失敗しました</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation>ファイルリストを読み込んでいます...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation>トークファイルの作成を中止しました</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation>ボイス化しています...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation>エンコーディングしています...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation>フォルダ名のトークファイルをコピーしています...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation>ファイル名のトークファイルをコピーしています...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation>トークファイルの作成が終了しました</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation>%1 のエンコーディングに失敗しました</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>%1 から %2 にファイルをコピーすることに失敗しました</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation>クリーンアップしています..</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 のボイス化に失敗しました： %2</translation>
     </message>
 </context>
 <context>
@@ -2511,187 +2357,188 @@ Rockbox %1 をインストールします。 最新の開発版をインスト�
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>テーマが選択されていません</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>ネットワークエラー: %1.
 ネットワークおよびプロキシーの設定を確認して下さい。</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation>以下のエラーが発生しました:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>終了しました。</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>%1 の説明を取得しています</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>プレビューを取得しています...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;制作者:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;バージョン:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;説明:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>説明はありません</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>テーマのプレビューはありません</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>テーマの情報を取得しています...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>マウントポイントが間違っています!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
-        <translation type="unfinished"></translation>
+        <translation>選択されていません</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>情報</translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>ダウンロードサイズ %L1 kiB (%n アイテム)</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>テーマのプレビュー画像の取得に失敗しました。
+HTTP レスポンスコード: %1</translation>
     </message>
 </context>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>ファイルの解凍処理が正常に終了しました。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>zip ライブラリの初期化に失敗しました。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>zip ライブラリのエラー。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>ファイルの作成または、ファイルを開くことができません。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>圧縮ファイルの一部が壊れています。 いくつかのファイルは、取り出せるかもしれません。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>圧縮ファイルは壊れています。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>パスワードが間違っています。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>まだ、圧縮ファイルは作成されていません。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>ファイルまたは、フォルダが存在しません。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>ファイルの読み込みエラー。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>ファイルの書き込みエラー。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>ファイルのシークエラー。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>フォルダが作成できません。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>不正なデバイス。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>不正または、zip 形式と互換性のない圧縮ファイル。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation>ヘッダが正しくありません。圧縮ファイルが壊れている可能性があります。</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>不明なエラー。</translation>
     </message>
@@ -2775,37 +2622,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation>ボイスファイルの作成を開始しています</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>ダウンロードエラー: HTTP 受信のエラー %1.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation>キャッシュファイルを使用しました。</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation>ダウンロードエラー: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation>ダウンロードが終了しました。</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation>ダウンロードしたファイルが開けませんでした</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation>TTSエンジンの初期化に失敗しました</translation>
     </message>
@@ -2840,9 +2687,9 @@ HTTP response code: %1</source>
         <translation>正常に作成されました。</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
-        <translation type="unfinished"></translation>
+        <translation>rockbox-info.txt が見つかりませんでした</translation>
     </message>
 </context>
 <context>
@@ -2901,72 +2748,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>終了しました。</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>インストールが正常に終了しました。</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>%1.%2 をダウンロードしています</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>ダウンロードエラー: HTTP 受信のエラー %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>キャッシュファイルを使用しました。</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>ダウンロードエラー: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>ダウンロードが終了しました。</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>解凍しています。</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>圧縮ファイルが開けませんでした: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>解凍に失敗しました: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>ファイルをインストールしています。</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>ファイルのインストールに失敗しました。</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>インストール時のログを作成しています</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>ディスクの空き領域が足りません! 処理を中止します。</translation>
     </message>
@@ -2994,12 +2841,12 @@ HTTP response code: %1</source>
         <translation>クレジット(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>ライセンス(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>Ok(&amp;O)</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_nl.ts b/rbutil/rbutilqt/lang/rbutil_nl.ts
index addfc0299f..a2ed500b00 100644
--- a/rbutil/rbutilqt/lang/rbutil_nl.ts
+++ b/rbutil/rbutilqt/lang/rbutil_nl.ts
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="nl">
+<!DOCTYPE TS><TS version="1.1" language="nl">
 <context>
     <name>BootloaderInstallBase</name>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="68"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="69"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Download fout: HTTP fout %1.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="74"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="75"/>
         <source>Download error: %1</source>
         <translation>Download fout : %1</translation>
     </message>
@@ -49,7 +48,7 @@
         <translation>Bezig met creëren van installatie log</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="150"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="152"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation>Bootloader installatie is bijna voltooid. De installatie &lt;b&gt;vereist&lt;/b&gt; dat u de volgende stappen handmatig uitvoert:</translation>
     </message>
@@ -59,22 +58,22 @@
         <translation>&lt;li&gt;Verwijder veilig uw spaler.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="162"/>
         <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Herstart uw speler naar de Originele Firmware.&lt;/li&gt;&lt;li&gt;Voer een Firmware upgrade uit, gebruik makend van de functionaliteit van de Originele Firmware. Gelieve de handleiding van uw speler na te zien voor meer details.&lt;/li&gt;&lt;li&gt;Nadat de Firmware upgedatete is, herstart uw speler.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="167"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="168"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation>&lt;li&gt;Zet de speler uit&lt;/li&gt;&lt;li&gt;Steek de oplader erin&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="172"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="175"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation>&lt;li&gt;Ontkoppel USB en stroomadapters&lt;/li&gt;&lt;li&gt;Hou &lt;i&gt;Power&lt;/i&gt; ingedrukt om de speler uit te schakelen&lt;/li&gt;&lt;li&gt;Zet de batterij schakelaar aan en uit op de speler&lt;/li&gt;&lt;li&gt;Hou &lt;i&gt;Power&lt;/i&gt; ingedrukt om in Rockbox op te starten&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="180"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Noot:&lt;/b&gt; U kan veilig andere delen eerst installeren, maar de hierboven vermelde stappen zijn &lt;b&gt;verplicht&lt;/b&gt; om de installatie te voltooien!&lt;/p&gt;</translation>
     </message>
@@ -135,7 +134,7 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="49"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation>De Bootloader installatie vereist een firmware bestand van de Originele Firmware (hex bestand). U moet dit bestand zelf downloaden om legale redenen. Gelieve in de &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;handleiding&lt;/a&gt; en de &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki pagina te kijken hoe u dit bestand moet verkrijgen.&lt;br/&gt;Druk op Ok om verder te gaan en te bladeren naar het firmware bestand.</translation>
     </message>
@@ -298,7 +297,7 @@
         <translation>Fout: kan geen buffer geheugen alloceren!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="63"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation>Geen Ipod gevonden
@@ -310,8 +309,7 @@ Machtigingen voor schijf toegang geweigerd!</translation>
         <translation>Geen Ipod gevonden!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="76"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="115"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation>Waarschuwing: Dit is een MacPod, Rockbox werkt alleen op WinPods.
@@ -323,19 +321,16 @@ Zie http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
         <translation>Bezig met downloaden van Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="103"/>
         <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation>Kon firmware map niet lezen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
         <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation>Onbekend versie nummer in firmware (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="122"/>
         <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation>Kon Ipod niet openen in R/W modus</translation>
@@ -376,10 +371,6 @@ Zie http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
         <translation>Fout tijdens lezen van de partitie tabel - mogelijks geen Ipod</translation>
     </message>
     <message>
-        <source>Could not read partition table</source>
-        <translation type="obsolete">Kon de partitie tabel niet lezen</translation>
-    </message>
-    <message>
         <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation>Geen Firmware partitie op de schijf</translation>
@@ -451,7 +442,7 @@ Zie http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
         <translation>Bezig met zoeken naar Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="67"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation>Machtigingen voor schijf toegang geweigerd!
@@ -468,20 +459,7 @@ Dit is vereist om de Bootloader te installeren</translation>
         <translation>Bezig met downloaden van Bootloader</translation>
     </message>
     <message>
-        <source>could not open Sansa</source>
-        <translation type="obsolete">kon Sansa niet openen</translation>
-    </message>
-    <message>
-        <source>could not read partitiontable</source>
-        <translation type="obsolete">kon de partitie tabel niet lezen</translation>
-    </message>
-    <message>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation type="obsolete">Schijf is geen Sansa (Error: %1), afbreken.</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="100"/>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="168"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -493,7 +471,6 @@ voor de eerste keer op te starten.
 Zie http://www.rockbox.org/wiki/SansaE200Install</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="110"/>
         <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation>Kon Sansa niet openen in R/W modus</translation>
@@ -595,20 +572,19 @@ Zie http://www.rockbox.org/wiki/SansaE200Install</translation>
         <translation>U moet de applicatie herstarten om de veranderde taal in te schakelen.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="608"/>
         <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>Autoherkenning</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="609"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Kon geen Mountpunt herkennen.
 Gelieve uw Mountpunt manueel te selecteren.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="618"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Kon geen apparaat herkennen.
@@ -620,7 +596,7 @@ Selecteer uw apparaat en Mountpunt manueel.</translation>
         <translation>Wilt u zeker de cache ledigen?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="629"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Wilt u zeker de cache ledigen? Wees absoluut zeker dat deze instelling correct is aangezien het &lt;b&gt;alle&lt;/b&gt; bestanden in deze map zal verwijderen!</translation>
     </message>
@@ -640,14 +616,14 @@ Selecteer uw apparaat en Mountpunt manueel.</translation>
         <translation>Selecteer uw apparaat</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="578"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>Sansa e200 in MTP modus gevonden!
 U moet uw speler in MSC modus plaatsen voor installatie.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="581"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation>H10 20GB in MTP modus gevonden!
@@ -664,12 +640,12 @@ U moet uw speler in UMS modus plaatsen voor installatie.</translation>
         <translation>Fatale fout</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="264"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Huidige cache grootte is %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation>Er is een niet ondersteunde speler %1 herkend. Sorry, Rockbox werkt niet op deze speler.</translation>
     </message>
@@ -679,13 +655,11 @@ U moet uw speler in UMS modus plaatsen voor installatie.</translation>
         <translation>Fatale fout: incompatibele speler gevonden</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="355"/>
         <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation>Configuratie OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="360"/>
         <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation>Configuratie ONGELDIG</translation>
@@ -721,7 +695,7 @@ U moet uw speler in UMS modus plaatsen voor installatie.</translation>
         <translation>Geen speler geselecteerd</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="160"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation>Cache pad is niet schrijfbaar. Laat het pad leeg om het systeemsstandaard tijdelijke pad te gebruiken.</translation>
     </message>
@@ -759,7 +733,6 @@ U moet uw speler in UMS modus plaatsen voor installatie.</translation>
         <translation>Selecteer uw apparaat in het &amp;bestandssysteem</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="55"/>
         <location filename="../configurefrm.ui" line="288"/>
         <source>&amp;Browse</source>
         <translation>&amp;Zoeken</translation>
@@ -917,7 +890,6 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation>Configureer TTS Engine</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="396"/>
         <location filename="../configurefrm.ui" line="433"/>
         <source>Configuration invalid!</source>
         <translation>Configuratie ongeldig!</translation>
@@ -941,7 +913,7 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="471"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Nederlands</translation>
@@ -998,52 +970,50 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="93"/>
-        <location filename="../createvoicewindow.cpp" line="96"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Geselecteerde TTS engine: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="104"/>
-        <location filename="../createvoicewindow.cpp" line="107"/>
-        <location filename="../createvoicewindow.cpp" line="111"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Geselecteerde Encoder: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="obsolete">Configurate</translation>
-    </message>
-    <message>
-        <source>Configure Encoder</source>
-        <translation type="obsolete">Configureer Encoder</translation>
-    </message>
+    <name>EncExes</name>
     <message>
-        <source>Path to Encoder</source>
-        <translation type="obsolete">Pad naar Encoder</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Browse</source>
-        <translation type="obsolete">&amp;Bladeren</translation>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <source>Encoder options</source>
-        <translation type="obsolete">Encoder opties</translation>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reset</source>
-        <translation type="obsolete">Reset</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Ok</source>
-        <translation type="obsolete">&amp;OK</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Annuleren</translation>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1087,7 +1057,7 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation>Mount punt is verkeerd!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation>Dit is de meest recente Rockbox build. Een huidige build zal upgedatet worden elke keer een verandering is gemaakt. Laatste versie is  r%1 (%2).</translation>
     </message>
@@ -1097,16 +1067,12 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation>Dit is de laatst gereleasede versie van Rockbox.</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Pas op:&lt;/b&gt; De laatste gereleasede versie is %1. &lt;b&gt;Dit is de aanbevolen versie.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="267"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation>Deze worden elke dag automatisch gebouwd van de meest recente broncode. Deze heeft algemeen gezien meer features dan de laatst stabiele release maar kan minder stabiel zijn. Features kunnen regelmatig veranderen.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="271"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;Pas op:&lt;/b&gt; gearchiveerde versie is r%1(%2).</translation>
     </message>
@@ -1131,7 +1097,7 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation>Backup mislukt!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="255"/>
+        <location filename="../install.cpp" line="258"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation>&lt;b&gt;Note:&lt;/b&gt; The laatste versie is %1.&lt;b&gt;Dit is de aanbevolen versie.&lt;/b&gt;</translation>
     </message>
@@ -1330,15 +1296,12 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation>De map naar Talk is verkeerd!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="115"/>
-        <location filename="../installtalkwindow.cpp" line="118"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Geselecteerde TTS engine: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="125"/>
-        <location filename="../installtalkwindow.cpp" line="128"/>
-        <location filename="../installtalkwindow.cpp" line="132"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Geselecteerde Encoder: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1354,7 +1317,6 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>ProgressLoggerFrm</name>
     <message>
-        <location filename="../progressloggerfrm.ui" line="13"/>
         <location filename="../progressloggerfrm.ui" line="19"/>
         <source>Progress</source>
         <translation>Vooruitgang</translation>
@@ -1411,14 +1373,14 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
         <translation>(geen beschrijving beschikbaar)</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="399"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Uw machtigingen zijn niet voldoende om de Bootloader te installeren.
 Administrator privileges zijn nodig.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Verkeerd apparaat gevonden.
@@ -1431,45 +1393,6 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="obsolete">Configuratie</translation>
-    </message>
-    <message>
-        <source>Configure RbSpeex Encoder</source>
-        <translation type="obsolete">Configureer RbSpeex Encoder</translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="obsolete">Volume</translation>
-    </message>
-    <message>
-        <source>Narrowband</source>
-        <translation type="obsolete">Smalband</translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="obsolete">Kwaliteit</translation>
-    </message>
-    <message>
-        <source>Complexity</source>
-        <translation type="obsolete">Complexiteit</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Annuleren</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="obsolete">Reset</translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
         <location filename="../rbutilqt.cpp" line="84"/>
@@ -1482,22 +1405,22 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Versie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="250"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>Netwerk fout:%1. Gelieve uw netwerk en proxy instelling te controleren.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="351"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; op &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="370"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;PDF Handboek&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="372"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;HTML Handboek (opent in een browser)&lt;/a&gt;</translation>
     </message>
@@ -1507,22 +1430,16 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Selecteer een apparaat voor een link naar het correcte handboek</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="377"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Handboek overzicht&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="386"/>
-        <location filename="../rbutilqt.cpp" line="442"/>
-        <location filename="../rbutilqt.cpp" line="621"/>
-        <location filename="../rbutilqt.cpp" line="799"/>
-        <location filename="../rbutilqt.cpp" line="848"/>
         <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>Bevestig Installatie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="465"/>
         <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Mount punt is verkeerd!</translation>
@@ -1563,7 +1480,7 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Bevestig download</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1029"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>Wilt u zeker het handboek downloaden? Dit handboek zal opgeslagen worden in de hoofdmap van uw speler.</translation>
     </message>
@@ -1573,7 +1490,7 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Bevestig installatie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1078"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Wilt u zeker Rockbox Utility installeren op uw speler? Na installatie kan u het opstarten vanaf  de harde schijf van uw speler.</translation>
     </message>
@@ -1603,7 +1520,6 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Rockbox Utility is succesvol geïnstalleerd.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="220"/>
         <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation>Configuratie fout</translation>
@@ -1619,12 +1535,12 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Uw apparaat heeft de Doom plugin niet. Installatie wordt afgebroken.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1208"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Uw configuratie is ongeldig. Gelieve naar het configuratie scherm te gaan en de juiste instellingen te gebruiken.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="213"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Dit is een nieuwe installatie van Rockbox Utility, of een nieuwe versie. Het configuratie scherm zal nu openen, zodat u het programma kan instellen, of uw instellingen nakijken.</translation>
     </message>
@@ -1654,7 +1570,7 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="843"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation>Deze applicatie is nog steeds bezig met informatie over nieuwe Builds te downloaden. Gelieve binnen een korte periode opnieuw te proberen.</translation>
     </message>
@@ -1669,7 +1585,7 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Nieuwe installatie</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="221"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>Uw configuratie is ongeldig. Dit komt waarschijnlijk door een veranderd apparaat pad. Het configuratie scherm zal nu openen zodat u de fout kan herstellen.</translation>
     </message>
@@ -1714,7 +1630,7 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation>Maak Bootloader backup</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation>U kan een backup maken van de Originele Bootloader. Kies &quot;Ja&quot; om de output map op uw computer te selecteren waarin het bestand zal worden opgeslagen. Dit bestand zal geplaatst worden in een nieuwe map &quot;%1&quot; die zal worden aangemaakt onder de geselecteerde map.
@@ -1731,10 +1647,6 @@ Kies &quot;Nee&quot; om deze stap over te slaan.</translation>
         <translation>Vereisten</translation>
     </message>
     <message>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="obsolete">De Bootloader installatie verplicht u om een firmware file van de Originele Firmware te voorzien (hex file). U moet dit bestand zelf downloaden om legale redenen. Gelieve in de &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;handleiding&lt;/a&gt; en de &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki pagina te kijken hoe u dit bestand moet verkrijgen.&lt;br/&gt;Druk op Ok om verder te gaan en te bladeren naar het firmware bestand.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation>Selecteer firmware bestand</translation>
@@ -1765,7 +1677,7 @@ Kies &quot;Nee&quot; om deze stap over te slaan.</translation>
         <translation>Geen deïnstallatie methode bekend.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="387"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1773,7 +1685,7 @@ This will install Rockbox %1. To install the most recent development build avail
 Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te installeren, druk op &quot;Annuleren&quot; en gebruik de &quot;Installatie&quot; tab.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="443"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1815,7 +1727,6 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>&amp;Veranderen</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="134"/>
         <location filename="../rbutilqtfrm.ui" line="822"/>
         <source>&amp;Quick Start</source>
         <translation>&amp;Snelle start</translation>
@@ -1826,7 +1737,6 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>Welkom</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="228"/>
         <location filename="../rbutilqtfrm.ui" line="815"/>
         <source>&amp;Installation</source>
         <translation>&amp;Installatie</translation>
@@ -1842,13 +1752,11 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>Installeer de Bootloader</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="263"/>
         <location filename="../rbutilqtfrm.ui" line="266"/>
         <source>Install Rockbox</source>
         <translation>Installeer Rockbox</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="325"/>
         <location filename="../rbutilqtfrm.ui" line="829"/>
         <source>&amp;Extras</source>
         <translation>&amp;Extras</translation>
@@ -1874,7 +1782,6 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>Spelbestanden installeren</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="439"/>
         <location filename="../rbutilqtfrm.ui" line="837"/>
         <source>&amp;Accessibility</source>
         <translation>&amp;Toegankelijkheid</translation>
@@ -1895,13 +1802,11 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>Installeer de Talk bestanden</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="551"/>
         <location filename="../rbutilqtfrm.ui" line="845"/>
         <source>&amp;Uninstallation</source>
         <translation>&amp;Deïnstallatie</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="554"/>
         <location filename="../rbutilqtfrm.ui" line="586"/>
         <source>Uninstall Rockbox</source>
         <translation>Deïnstalleer Rockbox</translation>
@@ -2204,49 +2109,6 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="obsolete">Configuratie</translation>
-    </message>
-    <message>
-        <source>Configure TTS Engine</source>
-        <translation type="obsolete">Configureer TTS Engine</translation>
-    </message>
-    <message>
-        <source>TTS options</source>
-        <translation type="obsolete">TTS opties</translation>
-    </message>
-    <message>
-        <source>Language</source>
-        <translation type="obsolete">Taal</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="obsolete">Reset</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Annuleren</translation>
-    </message>
-    <message>
-        <source>Voice</source>
-        <translation type="obsolete">Stem</translation>
-    </message>
-    <message>
-        <source>Speed</source>
-        <translation type="obsolete">Snelheid</translation>
-    </message>
-    <message>
-        <source>Use Sapi 4</source>
-        <translation type="obsolete">Gebruik Sapi 4</translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2269,7 +2131,7 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>&lt;b&gt;Aangesloten USB apparaten&lt;/b&gt;&lt;br/&gt;</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="50"/>
+        <location filename="../sysinfo.cpp" line="51"/>
         <source>VID: %1 PID: %2, %3</source>
         <translation>VID: %1 PID: %2, %3</translation>
     </message>
@@ -2279,7 +2141,7 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>Bestandssysteem</translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="62"/>
+        <location filename="../sysinfo.cpp" line="63"/>
         <source>%1, %2 MiB available</source>
         <translation>%1, %2 MiB beschikbaar</translation>
     </message>
@@ -2305,78 +2167,81 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../base/tts.cpp" line="137"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation>TTS programma niet gevonden</translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="obsolete">Configuratie</translation>
-    </message>
-    <message>
-        <source>Configure TTS Engine</source>
-        <translation type="obsolete">Configureer TTS engine</translation>
-    </message>
-    <message>
-        <source>Path to TTS Engine</source>
-        <translation type="obsolete">Pad naar TTS engine</translation>
-    </message>
-    <message>
-        <source>&amp;Browse</source>
-        <translation type="obsolete">&amp;Bladeren</translation>
-    </message>
-    <message>
-        <source>TTS options</source>
-        <translation type="obsolete">TTS opties</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="obsolete">Reset</translation>
-    </message>
     <message>
-        <source>&amp;Ok</source>
-        <translation type="obsolete">&amp;OK</translation>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Annuleren</translation>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../base/tts.cpp" line="482"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation>engine kon de stem string niet vinden</translation>
     </message>
     <message>
-        <location filename="../base/tts.cpp" line="552"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation>Geen beschrijving beschikbaar</translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
     <message>
-        <source>&amp;Refresh</source>
-        <translation type="obsolete">&amp;Vernieuwen</translation>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TTSSapi</name>
     <message>
-        <location filename="../base/tts.cpp" line="232"/>
+        <location filename="../base/tts.cpp" line="238"/>
         <source>Could not copy the Sapi-script</source>
         <translation>Kon Sapi-script niet kopiëren</translation>
     </message>
     <message>
-        <location filename="../base/tts.cpp" line="253"/>
+        <location filename="../base/tts.cpp" line="259"/>
         <source>Could not start the Sapi-script</source>
         <translation>Kon Sapi-script niet starten</translation>
     </message>
+    <message>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TalkFileCreator</name>
@@ -2396,10 +2261,6 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>Initialisatie van de Encoder engine is mislukt</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="74"/>
-        <location filename="../talkfile.cpp" line="258"/>
-        <location filename="../talkfile.cpp" line="303"/>
-        <location filename="../talkfile.cpp" line="340"/>
         <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation>Talk bestand creatie afgebroken</translation>
@@ -2440,7 +2301,6 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>Bezig met kopiëren van Talk bestanden voor bestanden...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="358"/>
         <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Kopiëren van %1 naar %2 mislukt</translation>
@@ -2451,7 +2311,6 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>Bezig met opkuisen..</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="269"/>
         <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation>Omzetten naar spraak van %1 mislukt: %2</translation>
@@ -2503,14 +2362,14 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
         <translation>geen thema geselecteerd</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="101"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Netwerk fout: %1.
 Gelieve uw netwerk en proxy instellingen te bekijken.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="114"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation>de volgende fout is opgetreden:
@@ -2522,7 +2381,7 @@ Gelieve uw netwerk en proxy instellingen te bekijken.</translation>
         <translation>klaar.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="187"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>bezig met ophalen van details voor %1</translation>
     </message>
@@ -2537,7 +2396,6 @@ Gelieve uw netwerk en proxy instellingen te bekijken.</translation>
         <translation>&lt;b&gt;Auteur :&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="204"/>
         <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>onbekend</translation>
@@ -2591,7 +2449,7 @@ Gelieve uw netwerk en proxy instellingen te bekijken.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation>Ophalen van thema voorbeeld mislukt.\nHTTP respons code: %1</translation>
@@ -2736,7 +2594,6 @@ HTTP response code: %1</source>
 <context>
     <name>Uninstaller</name>
     <message>
-        <location filename="../base/uninstall.cpp" line="33"/>
         <location filename="../base/uninstall.cpp" line="46"/>
         <source>Starting Uninstallation</source>
         <translation>Bezig met starten van deïnstallatie</translation>
@@ -2906,7 +2763,7 @@ HTTP response code: %1</source>
         <translation>Bezig met downloaden van bestand %1.%2</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Download fout: HTTP fout %1.</translation>
     </message>
@@ -2931,12 +2788,12 @@ HTTP response code: %1</source>
         <translation>Bezig met uitpakken van bestand.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="141"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>Openen van archief mislukt: %1.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="160"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>Uitpakken mislukt: %1.</translation>
     </message>
@@ -2993,16 +2850,13 @@ HTTP response code: %1</source>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
-    <message>
+    <message encoding="UTF-8">
         <location filename="../aboutbox.ui" line="56"/>
         <source>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.
 
 © 2005 - 2009 The Rockbox Team.
 Released under the GNU General Public License v2.</source>
-        <translation>Installatie en schoonmaak hulpmiddel voor de Rockbox open source digitale audio player firmware.
-
-© 2005 - 2009 Het Rockbox Team.
-Vrijgegeven onder GNU General Public License v2.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/rbutil/rbutilqt/lang/rbutil_pt.ts b/rbutil/rbutilqt/lang/rbutil_pt.ts
index 446e9c362f..8fac389395 100644
--- a/rbutil/rbutilqt/lang/rbutil_pt.ts
+++ b/rbutil/rbutilqt/lang/rbutil_pt.ts
@@ -134,252 +134,257 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation>verificando código MD5 do ficheiro de entrada ...</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation>Mão consegiu verficar o ficheiro do firmware original</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation>Ficherio de firmware não reconhecido.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation>Código MD5 ok</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation>Ficheiro de firmware não corrosponde ao reprodutor seleccionado.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation>Desbaralhando ficheiro</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation>Erro ao desbaralhar: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation>Adicionando rotina de arranque ao ficheiro de firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation>não consegiu abrir ficheiro de entrada</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation>falha na leitura do cabeçalho</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation>falha na leitura do firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation>falha na abertura do ficheiro da rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation>falha na leitura da rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation>não consegue abrir ficheiro de saída</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation>falha na escrita do ficheiro de saída</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation>Erro ao corrigir: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation>Erro ao baralhar: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation>Verificando ficheiro do firmware modificado</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation>Erro: soma de controlo do ficheiro modificado incorrecta</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation>Sucesso: ficheiro de firmware modificado criado</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation>Não consegue abrir ficheiro de entrada</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation>Não consegue abrir ficheiro de saída</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation>ficheiro inválido: comprimento do cabeçalho incorrecto</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation>ficheiro inválido: cabeçalho irreconhecível</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation>ficheiro inválido: campo &quot;length&quot;  incorrecto</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation>ficheiro inválido: campo &quot;length2&quot;  incorrecto</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation>ficheiro inválido: erro na soma de controlo interna</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation>ficheiro inválido: campo &quot;length3&quot;  incorrecto</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished">Instalação da rotina de arranque obriga-o a fornecer um ficheiro de firmware do firmware original (ficheiro hexadecimal). Deve transferi-lo você mesmo devido a razões legais. Por favor veja o &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; e a página wiki &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; para saber como obter este ficheiro.&lt;br/&gt;Pressione Ok para continuar e explorar o seu computador pelo ficheiro de firmware.</translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>Erro: não consegue alocar memória para o buffer!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation>Nenhum Ipod detectado
 Permissão para aceder ao disco negada!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation>Ipod não detectado!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation>Aviso: Isto é um MacPod, Rockbox só corre em WInPods.
 Ver http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation>Falha na leitura da directoria do firmware</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation>Número de versão desconhecido no firmware (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation>Falha na abertura do Ipod em modo de leitura e escrita (R/W)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation>Adição com sucesso da rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation>Falha ao adicionar rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation>Nenhuma rotina de arranque detectada.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation>Remoção com sucesso da rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation>Falha na remoção da rotina de arranque.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation>Não consegiu abrir o Ipod</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation>Não consegiu ler tabela de partições</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation>Nenhuma partição do firmware no disco</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished">Instalando a rotina de arranque do Rockbox</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -427,49 +432,34 @@ Ver http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation>Erro: não consegue alocar memória para o buffer!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation>Procurando pelo Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation>Permissão para o acesso ao disco negada!
 Esta é necessária para instalar a rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation>Nenhum Sansa detectado!</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation>Transferindo rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation>não consegiu abrir o Sansa</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation>não consegiu ler tabela de partições</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation>Disco não é um Sansa (Erro: %1), a abortar.</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -482,67 +472,67 @@ Veja http://www.rockbox.org/wiki/SansaE200Install
 </translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation>Falha na abertura do Sansa em modo de leitura e escrita (R/W)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation>Rotina de arranque instalada com sucesso</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation>Falha ao instalar rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation>Não consegue encontrar Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation>Não consegiu abrir o Sansa</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation>Não consegiu ler tabela de partições</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation>Disco não é um Sansa (Erro %1), a abortar.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation>Remoção com sucesso da rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation>Falha na remoção da rotina de arranque.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished">Instalando a rotina de arranque do Rockbox</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -573,150 +563,150 @@ Veja http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>Idioma alterado</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>Tem de reiniciar a aplicação para a mudança de idioma ter efeito.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Tamanho actual da cache é %L1 kiB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation>Configuração OK</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation>Configuração INVÁLIDA</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation>Seleccione o seu dispositivo</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>Sansa e200 em modo MTP encontrado!
 Tem de mudar o reprodutor para o modo MSC para instalação.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation>H10 20GB em modo MTP encontrado!
 Tem de mudar o reprodutor para o modo UMS para instalação.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation>A não ser que tenha mudado esta instalação irá falhar!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation>Erro fatal</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation>Detectado uma variante não suportada do reprodutor %1. Desculpe, Rockbox não suporta o seu reprodutor.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation>Erro fatal: reprodutor incompatível encontrado</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>Auto-detecção</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Não consegiu detectar um ponto de montagem.
 Seleccione um ponto de montagem manualmente.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Não consegiu detectar um dispositivo.
 Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>Eliminar mesmo a cache?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>Quer mesmo eliminar a cache? Verique que esta opção está correcta já que irá remover &lt;b&gt;todos&lt;/b&gt; os ficheiros nesta directoria!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>Caminho incorrecto!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>O caminho da cache é inválido. A abortar.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation type="unfinished">Erro de Configuração</translation>
     </message>
@@ -922,7 +912,7 @@ Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation>Português (Portugal)</translation>
@@ -979,57 +969,83 @@ Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Motor TTS seleccionado: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Codificador seleccionado: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Configuração</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
-        <translation>Configurar Codificador</translation>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
-        <translation>Caminho para o Codificador</translation>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>E&amp;xplorar</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation>Opções do Codificador</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Reiniciar</translation>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1055,37 +1071,32 @@ Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
         <translation>Iniciando cópia de segurança...</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation>Cópia de segurança criada com sucesso</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation>Falha na cópia de segurança!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation>Esta é compilação do Rockbox actualizada ao minuto. Uma compilação actual será actualizada sempre que houver uma mudança. Última versão é r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>Esta é a última versão lançada do Rockbox.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Nota:&lt;/b&gt;A última versão lançada é %1. &lt;b&gt;Esta é a versão recomendada.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation>Estas são compiladas todos os dias do código fonte em actual, desenvolvimento. Este tem normalmente mais capacidades que a última versão estável mas pode ser muito menos estável. Capacidades podem mudar regularmente.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;Nota:&lt;/b&gt; versão arquivada é r%1 (%2).</translation>
     </message>
@@ -1095,15 +1106,20 @@ Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1274,17 +1290,17 @@ Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>A Directoria para Falar está incorrecta!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Motor TTS seleccionado: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Codificador seleccionado: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
@@ -1318,12 +1334,12 @@ Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>&amp;Abortar</translation>
     </message>
@@ -1331,176 +1347,128 @@ Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation>Convidado</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation>Administrador</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation>Utilizador</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation>(sem descrição disponível)</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Permissões insuficientes para a instalação da rotina de arranque
 Previlégios de administrador são necessários.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>&lt;li&gt;Detectado diferença de alvos.Alvo instalado: %1, alvo seleccionado: %2.&lt;/li&gt;</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation>Problema detectado:</translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Configuração</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation>Configurar Codificador RbSpeex</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation>Narrowband</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation>Qualidade</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation>Complexidade</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation>Reiniciar</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation>Erro de rede</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation>Não consegue obter informação da versão.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation>Nova instalação</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation>Esta é uma nova instalação do Rockbox Utility, ou uma nova versão. O diálogo de configuração irá agora abrir para permitir-lhe configurar o programa, ou rever as suas definições.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation>Erro de Configuração</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation>A sua configuração é inválida. Isto é provalvelmente devido a uma mudança do caminho do dispositivo. O diálogo de configuração irá agora abrir para permitir-lhe corrigir o problema.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>Erro de rede:%1. Por favor, verifique as suas definições de rede e do proxy.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; em &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Manual PDF&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Manual HTML (abre num navegador de internet)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>Seleccione um dispositivo para uma ligação ao manual correcto</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Visão Geral do Manual&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>Confirmar Instalação</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1509,7 +1477,7 @@ This will install Rockbox %1. To install the most recent development build avail
 Isto irá instalar Rockbox %1. Para instalar a compilação de desvolvimento mais recente pressione &quot;Cancelar&quot; e use o separador &quot;Instalação&quot;.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
@@ -1517,224 +1485,219 @@ This will install Rockbox %1. To install the most recent development build avail
 Isto irá instalar Rockbox %1. Para instalar a compilação de desvolvimento mais recente pressione &quot;Cancelar&quot; e use o separador &quot;Instalação&quot;.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Ponto de montagem está errado!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation>Quer mesmo continuar?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation>Abortado!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation>Instalação do Rockbox detectada</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation>Instalação do Rockbox detectada. Deseja criar uma cópia de segurança antes?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation>Iniciando a cópia de segurança...</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation>Cópia de segurança criada com sucesso</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation>Falha na cópia de segurança!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>Deseja instalar a Rotina de Arranque?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation>Nenhum método de instalação conhecido.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation>Rotina de arranque detectada</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation>Rotina de arranque já instalada. Deseja reinstalá-la?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation>Criar cópia de segurança da rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation>Pde criar uma cópia de segurança da rotina original de arranque. Pressione &quot;Sim&quot; para seleccionar uma directoria de saída no computador para guardar a cópia. O ficheiro será colocado numa nova directoria &quot;%1&quot; criada dentro da directoria seleccionada.
 Pressione &quot;No&quot; para passar este passo.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation>Explorar directoria de cópias de segurança</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation>Pré-requesitos</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation>Instalação da rotina de arranque obriga-o a fornecer um ficheiro de firmware do firmware original (ficheiro hexadecimal). Deve transferi-lo você mesmo devido a razões legais. Por favor veja o &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; e a página wiki &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; para saber como obter este ficheiro.&lt;br/&gt;Pressione Ok para continuar e explorar o seu computador pelo ficheiro de firmware.</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation>Seleccione ficheiro de firmware</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation>Erro ao abrir o ficheiro de firmware</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation>Erro na cópia de segurança</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation>Falha na criação da cópia de segurança. Continuar?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation>Passos manuais necessários</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>Deseja instalar os pacotes de fontes?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation>A Aplicação está ainda a transferir informação sobre novas compilações. Por favor, tente de novo em breve.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>Deseja instalar o ficheiro de voz?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation>O seu dispositivo não tem uma extensão do doom. A  abortar.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>Deseja instalar os ficheiros extras de jogo?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>Confirmar Desinstalação</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>Quer mesmo desinstalar a Rotina de Arranque?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation>Nenhum método de desinstalação conhecido.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>Confirmar transferência</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>Deseja transferir o manual? O manual será guardado na directoria raiz do reprodutor.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>Confirmar instalação</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Deseja instalar o Rockbox Utility no reprodutor? Após a instalação pode corrê-lo do disco rígido do reprodutor.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>Instalando Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Erro ao instalar Rockbox Utility</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>Instalando a configuração do utilizador</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>Erro ao instalar a configuração do utilizador</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Utility instalado com sucesso.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>A sua configuração é inválida. Por favor, vá ao diálogo de configuração e verifique que os valores inseridos estão correctos.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2145,59 +2108,6 @@ se instalou o ficheiro de voz, o Rockbox irá falar.</translation>
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Configuração</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Configuração do Motor TTS</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation>Linguagem</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation>Voz</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation>Velocidade</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation>Opções do TTS</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation>Reiniciar</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation>Usar Sapi 4</translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2256,150 +2166,86 @@ se instalou o ficheiro de voz, o Rockbox irá falar.</translation>
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation>Executável TTS não encontrado</translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation>Configuração</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation>Configurar Motor TTS</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation>Caminho para o motor TTS</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation>E&amp;xplorar</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
-        <translation>Opções do TTS</translation>
-    </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
-        <translation>Reiniciar</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Configuração</translation>
-    </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
+        <translation>Não consegiu copiar o Sapi-script</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
+        <translation>Não consegiu iniciar o Sapi-script</translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished">Actualizar</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TTSSapi</name>
-    <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
-        <translation>Não consegiu copiar o Sapi-script</translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
-        <translation>Não consegiu iniciar o Sapi-script</translation>
-    </message>
-</context>
-<context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation>Iniciando geração dos Ficheiros de Leitura</translation>
     </message>
@@ -2409,62 +2255,62 @@ se instalou o ficheiro de voz, o Rockbox irá falar.</translation>
         <translation>Falha na inicialização do motor TTS</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation>Falha na inicialização do motor codificador</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation>Lendo lista de ficheiros...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation>Criação dos Ficheiros de Leitura abortada</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation>Entradas de vocalização...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation>Codificando ficheiros...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation>Copiando Ficheiro de Leitura para Directorias...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation>Copiando Ficheiro de Leitura para Ficheiros...</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation>Terminado a criação dos ficherios de Leitura</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation>Codificação de %1 falhou</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation>Cópia de %1 para %2 falhou</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation>Limpando..</translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2510,91 +2356,91 @@ se instalou o ficheiro de voz, o Rockbox irá falar.</translation>
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>nehum tema seleccionado</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Erro de rede:%1
 Por favor, verifique as suas definições de rede e do proxy.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation>o erro seguinte ocorreu:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>completo.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>transferindo detalhes para %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>transferindo pré-visualização ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Autor:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Versão:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Descrição:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>sem descrição</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>sem pré-visualização do tema</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>transferindo informação dos temas ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>Ponto de omntagem está incorrecto!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -2602,7 +2448,7 @@ Por favor, verifique as suas definições de rede e do proxy.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -2611,87 +2457,87 @@ HTTP response code: %1</source>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>Operação ZIP completada com sucesso.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>Falha ao iniciaçizar ou carregar a biblioteca zlib.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>erro de biblioteca zlib.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>Incapaz de criar ou abrir ficheiro.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>Arquivo parcialmente corrompido. Alguns ficheiros podem ter sido extraídos.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>Arquivo corrupto.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>Palavra-chave errada.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>Nenhum arquivo foi ainda criado.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>Ficheiro ou directoria não existe.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>Erro de leitura de ficheiro.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>Erro na escrita de ficheiro.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>Erro de procura de ficheiro.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>Incapaz de criar uma directoria.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>Dispositivo inválido.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>Arquivo zip inválido ou incompatível.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation>Cabeçalhos inconsistentes. Arquivo pode estar corrupto.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>Erro desconhecido.</translation>
     </message>
@@ -2775,37 +2621,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation>Iniciando geração dos ficheiros de voz</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Erro de transferência: recebido erro de HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation>Ficheiro da cache usado.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation>Erro de transferência: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation>Tranferência terminada.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation>falha ao abrir ficheiro transferido</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation>Falha na inicialização do motor TTS</translation>
     </message>
@@ -2840,7 +2686,7 @@ HTTP response code: %1</source>
         <translation>criado com sucesso.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2901,72 +2747,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>completo.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>Instalação terminada com sucesso.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>Transferindo  ficheiro %1.%2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Erro de transferência: recebido erro de HTTP %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>Ficheiro de cache usado.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>Erro de transferência: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>Tranferência terminada.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>Extraindo ficheiro.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>Falha na abertura do arquivo: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation>Sem espaço suficiente em disco! A abortar.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>Falha na extracção: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>instanlando ficheiro.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>Falha na instalação do ficheiro.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>Criando registo da instalação</translation>
     </message>
@@ -2994,12 +2840,12 @@ HTTP response code: %1</source>
         <translation>&amp;Créditos</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>&amp;Licença</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_tr.ts b/rbutil/rbutilqt/lang/rbutil_tr.ts
index 4f2c1b65d7..1d19d63f1f 100644
--- a/rbutil/rbutilqt/lang/rbutil_tr.ts
+++ b/rbutil/rbutilqt/lang/rbutil_tr.ts
@@ -134,250 +134,255 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation type="unfinished">bilinmiyor</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation type="unfinished">Bellenim (firmware) dizini okunamadi</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation type="unfinished">Bilinmeyen bellenim (firmware) s�r�m numarasi (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation type="unfinished">Herhangi bir �ny�kleyici algilanamadi.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -425,48 +430,33 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation type="unfinished">Sansa a�ilamadi</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation type="unfinished">b�l�mlendirme tablosu okunamadi</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -475,67 +465,67 @@ See http://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -566,150 +556,150 @@ See http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>Dil degistirildi</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>Se�ilen dilin etkin olmasi i�in uygulamayi yeniden baslatmalisiniz.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation>Mevcut �nbellek boyutu %L1 KB.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation>Aygitinizi se�in</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation>MTP modunda bir Sansa e200 bulundu!
 Kurulum i�in aygiti MSC moduna almalisiniz. </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation>MTP modunda bir H10 20GB bulundu!
 Kurulum i�in aygiti UMS moduna almalisiniz. </translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation>Degistirmezseniz kurulum ger�eklestirilemez!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation>�nemli hata</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>Otomatik algilama</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>Herhangi bir baglama noktasi algilanamadi.
 Baglama noktasini kendiniz se�iniz.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>Herhangi bir aygit algilanamadi.
 Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>�nbellegi silmek istediginizden emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>�nbellegi silmeyi onayliyor musunuz? Bu se�enek ilgili dizindeki &lt;b&gt;t�m&lt;/b&gt; dosyalari silecek!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>Konum hatali!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>�nbellek konumu ge�ersiz. Islem durduruluyor.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation type="unfinished">Yapilandirma hatasi</translation>
     </message>
@@ -915,7 +905,7 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation type="unfinished">T�rk�e</translation>
@@ -972,57 +962,83 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Yapilandirma</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;G�z At</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation type="unfinished">Kodlayici Se�enekleri</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;Tamam</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Iptal</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1033,27 +1049,22 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
         <translation>Baglama noktasi hatali!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation>En g�ncel Rockbox insasidir. Mevcut insa bir degisiklik yapildiginda g�ncellenir. Son s�r�m r%1 (%2) dir.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>Bu Rockbox&apos;in kararli en son s�r�m�d�r.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Not:&lt;/b&gt; Son s�r�m %1 dir. &lt;b&gt;�nerilen s�r�m budur.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation>Mevcut kaynak koddan her g�n otomatik insa edilir. Genellikle son s�r�mden daha fazla �zellik barindirmasina ragmen daha az kararli olabilir. �zellikler s�rekli degismektedir.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;Not:&lt;/b&gt; arsivlenen s�r�m r%1 (%2) dir.</translation>
     </message>
@@ -1068,12 +1079,12 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1088,15 +1099,20 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1267,17 +1283,17 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>Konusma dizini hatali!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1311,12 +1327,12 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation>&amp;Tamam</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>&amp;Durdur</translation>
     </message>
@@ -1324,405 +1340,352 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation type="unfinished">Hata</translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Yapilandirma</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;Tamam</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Iptal</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>Dosya</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>S�r�m</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation>Yapilandirma hatasi</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>Ag hatasi: %1. L�tfen ag ve vekil sunucu ayarlarinizi kontrol ediniz.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; Baglanti Noktasi: &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Kilavuz (PDF)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Kilavuz (HTML) -- tarayicida a�ilir&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>Uygun kilavuz i�in aygit se�iniz</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;Kilavuz Genel A�iklamasi&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>Kurulumu onayla</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Baglama noktasi hatali!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>�ny�kleyiciyi kurmak istediginizden emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>Yazi tipi paketini kurmak istediginizden emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>Seslendirme dosyasini y�klemek istediginizden emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation>Aygitinizda doom eklentisi bulunmamaktadir. Islem durduruluyor.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>Oyun eklenti dosyalarini y�klemek istediginizden emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>Kaldirma islemini onayla</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>�ny�kleyiciyi kaldirmak istediginizden emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>Indirme islemini onayla</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>Kilavuzu indirmek istiyor musunuz? Aygitinizin bulundugu konuma kaydedilecektir.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>Kurulumu onayla</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>Rockbox Aracini aygitiniza kurmak istediginizden emin misiniz? Kurulum sonrasi aygitinizin diskinden �alistirabilirsiniz.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>Rockbox Araci Kuruluyor</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>Rockbox Araci kurulumunda hata</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>Kullanici yapilandirmasi y�kleniyor</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>Kullanici yapilandirmasi y�kleme isleminde hata</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>Rockbox Araci basariyla kuruldu.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation>Yapilandirmaniz ge�ersiz. Yapilandirma ekranina giderek se�ilen degerlerin dogrulugundan emin olun.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2132,59 +2095,6 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Yapilandirma</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;Tamam</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Iptal</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2243,150 +2153,86 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Yapilandirma</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;G�z At</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;Tamam</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Iptal</translation>
-    </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">Yapilandirma</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSSapi</name>
     <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2396,62 +2242,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2497,91 +2343,91 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>tema se�ilmedi</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>Ag hatasi: %1.
 L�tfen ag ve vekil sunucu ayarlarinizi kontrol ediniz.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation>olusan hata:
 %1</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>tamamlandi.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>%1 in bilgileri aliniyor</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>�nizleme getiriliyor ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;Sahibi:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>bilinmiyor</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;S�r�m:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;A�iklama:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>a�iklama yok</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>tema �nizlemesi yok</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>temalarin bilgileri aliniyor ...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>Baglama noktasi hatali!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -2589,7 +2435,7 @@ L�tfen ag ve vekil sunucu ayarlarinizi kontrol ediniz.</translation>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -2598,87 +2444,87 @@ HTTP response code: %1</source>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>ZIP islemi basariyla tamamlandi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>zlib k�t�phanesi y�klenemedi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>zlib k�t�phane hatasi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>Dosya olusturulamadi veya a�ilamadi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>Kismi bozuk arsiv. Bazi dosyalar a�ilmis olabilir.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>Bozuk arsiv.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>Yanlis parola.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>Hen�z herhangi bir arsiv dosyasi olusturulmadi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>Dosya veya dizin mevcut degil.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>Dosya okuma hatasi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>Dosyaya yazma hatasi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>Dosya konumlandirma hatasi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>Dizin olusturulamadi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>Ge�ersiz aygit.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>Bozuk veya tamamlanmamis arsiv dosyasi.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation>Tutarsiz basliklar. Arsiv bozulmus olabilir.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>Bilinmeyen hata.</translation>
     </message>
@@ -2762,37 +2608,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">Indirme hatasi: HTTP %1 hatasi.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation type="unfinished">�nbellekteki dosya kullanildi.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation type="unfinished">Indirme hatasi: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation type="unfinished">Indirme islemi tamamlandi.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2827,7 +2673,7 @@ HTTP response code: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2888,72 +2734,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>tamamlandi.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>Y�kleme basariyla tamamlandi.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>Dosya indiriliyor %1.%2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>Indirme hatasi: HTTP %1 hatasi.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>�nbellekteki dosya kullanildi.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>Indirme hatasi: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>Indirme islemi tamamlandi.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>Dosya �ikariliyor.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>Arsiv a�ilamadi: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>Arsivden �ikarma islemi basarisiz: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>Dosya y�kleniyor.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>Dosya y�kleme islemi basarisiz.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>Kurulum kayit dosyasi yaratiliyor</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2981,12 +2827,12 @@ HTTP response code: %1</source>
         <translation>&amp;Hazirlayanlar</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>&amp;Lisans</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>&amp;Tamam</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts b/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
index aa4b18917e..da9d0d8194 100644
--- a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
+++ b/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
@@ -134,250 +134,255 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation type="unfinished">不明</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation type="unfinished">读不了固件文件夹</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation type="unfinished">固件版本不明 (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation type="unfinished">找不到启动程序.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -425,48 +430,33 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation type="unfinished">打开不了 sansa</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation type="unfinished">读不了分区表</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -475,67 +465,67 @@ See http://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -566,148 +556,148 @@ See http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>语言已改变</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>你需要重新开启本软件才能使用新语言.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>自动识别</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>找不到 mountpoint
 请手动选择你的 mountpoing.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>不能识别你的播放器
 请手动选择.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>你肯定要删除缓冲吗?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>你真的肯定要删除缓冲吗? 请确认你的设定是正确的因为这会删除 &lt;b&gt;全部&lt;/b&gt; 的文件在此文件夹 !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>路径错误!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>缓冲路径错误. 正在取消.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -913,7 +903,7 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation type="unfinished">中文 (Chinese Simplified)</translation>
@@ -970,57 +960,83 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">设置</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;浏览</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation type="unfinished">信号转换器设置</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;OK</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;取消</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1031,27 +1047,22 @@ You need to change your player to UMS mode for installation. </source>
         <translation>Mountpoint 错误!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation>这是最新的Rockbox版本. 每一个更改后这版本就会更新. 最新的版本是 r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>这是最新的Rockbox版本.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;注意:&lt;/b&gt; 最新的版本是 %1. &lt;b&gt;这是建议使用的版本.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;注意:&lt;/b&gt; 存档的版本是 r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1066,12 +1077,12 @@ You need to change your player to UMS mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1086,15 +1097,20 @@ You need to change your player to UMS mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1265,17 +1281,17 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>要支持语音的文件夹错误!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1309,12 +1325,12 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>&amp;取消</translation>
     </message>
@@ -1322,405 +1338,352 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">设置</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;取消</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>文件</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>网络错误： %1. 请检查你的网络和代理服务的设置.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; 在 &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;PDF 用户手册(英文)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;HTML 用户手册(英文,在浏览器打开)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>请选择你的播放器</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;用户手册总观&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Mountpoint 错误!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>你确认要安装启动程序?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>你确认要安装字体包裹吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>你确认要安装语音文件吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>你确认要安装游戏附件吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>你确认要卸载启动程序吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>确认下载</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>你确认要下载用户手册吗? 用户手册将会被放在你播放器的主目录里.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>你确认要安装Rockbox安装程序到你的播放器上吗? 安装后你可以从你播放器上运行此程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>安装 Rockbox安装程序</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>安装 Rockbox安装程序错误!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>安装用户设置</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>安装用户设置错误</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>成功安装 Rockbox安装程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2130,59 +2093,6 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">设置</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;取消</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2241,150 +2151,86 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">设置</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;浏览</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;取消</translation>
-    </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">设置</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSSapi</name>
     <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2394,62 +2240,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2495,97 +2341,97 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>没有选择主题</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>网络错误： %1. 
 请检查你的网络和代理服务的设置.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>正在拿取 %1 的细节</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>正在拿取预览...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;作者:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;版本:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;描述:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>无描述</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>无主题预览</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>正在拿取主题信息...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>Mountpoint 错误!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -2594,87 +2440,87 @@ HTTP response code: %1</source>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>成功完成 ZIP 程序.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>初始化zlib失败.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>zlib错误.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>无法建立或打开文件.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>压缩文件部分损坏. 一些文件可能可以被恢复. </translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>压缩文件损坏.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>密码不正确.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>压缩文件还没有被建立.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>文件或文件夹不存在.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>文件读取错误.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>文件写入错误.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>文件内寻找错误.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>无法建立文件夹.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>无效播放器.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>无效或不支持压缩文件.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation>文件头不正常. 压缩文件可能已损坏. </translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>不明错误.</translation>
     </message>
@@ -2758,37 +2604,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">下载错误: 接到 HTTP 错误 %1. </translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation type="unfinished">使用缓冲文件.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation type="unfinished">下载错误: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation type="unfinished">完成下载.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2823,7 +2669,7 @@ HTTP response code: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2884,72 +2730,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>成功完成安装.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>正在下载文件 %1.%2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>下载错误: 接到 HTTP 错误 %1. </translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>使用缓冲文件.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>下载错误: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>完成下载.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>正在解压文件.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>打开压缩文件错误: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>解压错误: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>正在安装文件.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>安装文件失败.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>正在建立安装日志</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2977,12 +2823,12 @@ HTTP response code: %1</source>
         <translation>&amp;特别鸣谢</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>&amp;授权</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
diff --git a/rbutil/rbutilqt/lang/rbutil_zh_TW.ts b/rbutil/rbutilqt/lang/rbutil_zh_TW.ts
index 3acfd7aa4c..32aca75b13 100644
--- a/rbutil/rbutilqt/lang/rbutil_zh_TW.ts
+++ b/rbutil/rbutilqt/lang/rbutil_zh_TW.ts
@@ -134,250 +134,255 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="55"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
         <source>checking MD5 hash of input file ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
         <source>Could not verify original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
         <source>Firmware file not recognized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
         <source>MD5 hash ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
         <source>Descrambling file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
         <source>Error in descramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
         <source>Adding bootloader to firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>could not open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="159"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading header failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>reading firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="161"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>can&apos;t open bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="162"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>reading bootloader file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="164"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
         <source>writing output file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
         <source>Error in patching: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
         <source>Error in scramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
         <source>Checking modified firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="194"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
         <source>Error: modified file checksum wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="202"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="233"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>Can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="235"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: header length wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="236"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: unrecognized header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="237"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="238"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="239"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: internal checksum error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="240"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="241"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
         <source>unknown</source>
         <translation type="unfinished">不明</translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallhex.cpp" line="58"/>
+        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="46"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="64"/>
         <source>No Ipod detected
 Permission for disc access denied!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="62"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
         <source>No Ipod detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="108"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods.
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="73"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="161"/>
         <source>Failed to read firmware directory</source>
         <translation type="unfinished">讀不了固件文件夾</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="166"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation type="unfinished">固件版本不明 (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="173"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="131"/>
         <source>Successfull added bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="130"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="138"/>
         <source>Failed to add bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="179"/>
         <source>No bootloader detected.</source>
         <translation type="unfinished">找不到啟動程序.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="185"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="192"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="224"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
         <source>Could not open Ipod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="229"/>
-        <source>Could not read partition table</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="234"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="263"/>
         <source>No firmware partition on disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="93"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="142"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="150"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallipod.cpp" line="257"/>
+        <source>Error reading partition table - possibly not an Ipod</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallMi4</name>
@@ -425,48 +430,33 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="48"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="53"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
         <source>Searching for Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="68"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
         <source>No Sansa detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="89"/>
-        <source>could not open Sansa</source>
-        <translation type="unfinished">打開不了 sansa</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="96"/>
-        <source>could not read partitiontable</source>
-        <translation type="unfinished">讀不了分區表</translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="104"/>
-        <source>Disk is not a Sansa (Error: %1), aborting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="201"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="171"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -475,67 +465,67 @@ See http://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="154"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="144"/>
         <source>Failed to install bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="236"/>
         <source>Can&apos;t find Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="241"/>
         <source>Could not open Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="185"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="246"/>
         <source>Could not read partition table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="192"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="253"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="214"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="184"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="191"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="92"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="169"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="159"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -566,148 +556,148 @@ See http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="117"/>
+        <location filename="../configure.cpp" line="119"/>
         <source>Language changed</source>
         <translation>語言已改變</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="118"/>
+        <location filename="../configure.cpp" line="120"/>
         <source>You need to restart the application for the changed language to take effect.</source>
         <translation>你需要重新開啟本軟件才能使用新語言.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="624"/>
+        <location filename="../configure.cpp" line="617"/>
         <source>Autodetection</source>
         <translation>自動識別</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="617"/>
+        <location filename="../configure.cpp" line="610"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>找不到 mountpoint
 請手動選擇你的 mountpoing.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="626"/>
+        <location filename="../configure.cpp" line="619"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>不能識別你的播放器
 請手動選擇.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="635"/>
+        <location filename="../configure.cpp" line="628"/>
         <source>Really delete cache?</source>
         <translation>你肯定要刪除緩沖嗎?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="638"/>
+        <location filename="../configure.cpp" line="631"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>你真的肯定要刪除緩沖嗎? 請确認你的設定是正确的因為這會刪除 &lt;b&gt;全部&lt;/b&gt; 的文件在此文件夾 !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="644"/>
+        <location filename="../configure.cpp" line="637"/>
         <source>Path wrong!</source>
         <translation>路徑錯誤!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="638"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>緩沖路徑錯誤. 正在取消.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="269"/>
+        <location filename="../configure.cpp" line="265"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="495"/>
+        <location filename="../configure.cpp" line="488"/>
         <source>Select your device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="587"/>
+        <location filename="../configure.cpp" line="579"/>
         <source>Sansa e200 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="590"/>
+        <location filename="../configure.cpp" line="582"/>
         <source>H10 20GB in MTP mode found!
 You need to change your player to UMS mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="591"/>
+        <location filename="../configure.cpp" line="583"/>
         <source>Unless you changed this installation will fail!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="593"/>
+        <location filename="../configure.cpp" line="585"/>
         <source>Fatal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="602"/>
+        <location filename="../configure.cpp" line="595"/>
         <source>Detected an unsupported %1 player variant. Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="604"/>
+        <location filename="../configure.cpp" line="597"/>
         <source>Fatal error: incompatible player found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="391"/>
+        <location filename="../configure.cpp" line="384"/>
         <source>Configuration OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="396"/>
+        <location filename="../configure.cpp" line="389"/>
         <source>Configuration INVALID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="94"/>
+        <location filename="../configure.cpp" line="96"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="125"/>
+        <location filename="../configure.cpp" line="127"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="129"/>
+        <location filename="../configure.cpp" line="131"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="133"/>
+        <location filename="../configure.cpp" line="135"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="137"/>
+        <location filename="../configure.cpp" line="139"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="151"/>
+        <location filename="../configure.cpp" line="153"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="159"/>
+        <location filename="../configure.cpp" line="161"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="177"/>
+        <location filename="../configure.cpp" line="179"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="180"/>
+        <location filename="../configure.cpp" line="182"/>
         <source>Configuration error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -913,7 +903,7 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="479"/>
+        <location filename="../configure.cpp" line="472"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation type="unfinished">中文 (Chinese Traditional)</translation>
@@ -970,57 +960,83 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="124"/>
+        <location filename="../createvoicewindow.cpp" line="112"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EncExesCfgFrm</name>
+    <name>EncExes</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">設置</translation>
+        <location filename="../base/encoders.cpp" line="95"/>
+        <source>Path to Encoder:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="19"/>
-        <source>Configure Encoder</source>
+        <location filename="../base/encoders.cpp" line="97"/>
+        <source>Encoder options:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncRbSpeex</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="31"/>
-        <source>Path to Encoder</source>
+        <location filename="../base/encoders.cpp" line="161"/>
+        <source>Volume:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;瀏覽</translation>
+        <location filename="../base/encoders.cpp" line="163"/>
+        <source>Quality:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="52"/>
-        <source>Encoder options</source>
-        <translation type="unfinished">信號轉換器設置</translation>
+        <location filename="../base/encoders.cpp" line="165"/>
+        <source>Complexity:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
+        <location filename="../base/encoders.cpp" line="167"/>
+        <source>Use Narrowband:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EncTtsCfgGui</name>
     <message>
-        <location filename="../encexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;OK</translation>
+        <location filename="../encttscfggui.cpp" line="32"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;取消</translation>
+        <location filename="../encttscfggui.cpp" line="67"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="70"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="173"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="181"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="353"/>
+        <source>Select excutable</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1031,27 +1047,22 @@ You need to change your player to UMS mode for installation. </source>
         <translation>Mountpoint 錯誤!</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="234"/>
+        <location filename="../install.cpp" line="239"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is r%1 (%2).</source>
         <translation>這是最新的Rockbox版本. 每一個更改后這版本就會更新. 最新的版本是 r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="245"/>
+        <location filename="../install.cpp" line="252"/>
         <source>This is the last released version of Rockbox.</source>
         <translation>這是最新的Rockbox版本.</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="251"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt;The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;注意:&lt;/b&gt; 最新的版本是 %1. &lt;b&gt;這是建議使用的版本.&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location filename="../install.cpp" line="265"/>
+        <location filename="../install.cpp" line="272"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is r%1 (%2).</source>
         <translation>&lt;b&gt;注意:&lt;/b&gt; 存檔的版本是 r%1 (%2).</translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="263"/>
+        <location filename="../install.cpp" line="270"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1066,12 +1077,12 @@ You need to change your player to UMS mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="167"/>
+        <location filename="../install.cpp" line="168"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="171"/>
+        <location filename="../install.cpp" line="172"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1086,15 +1097,20 @@ You need to change your player to UMS mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="198"/>
+        <location filename="../install.cpp" line="203"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../install.cpp" line="236"/>
+        <location filename="../install.cpp" line="241"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../install.cpp" line="258"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallFrm</name>
@@ -1265,17 +1281,17 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="86"/>
+        <location filename="../installtalkwindow.cpp" line="88"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>要支持語音的文件夾錯誤!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="126"/>
+        <location filename="../installtalkwindow.cpp" line="119"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="133"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1309,12 +1325,12 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="92"/>
+        <location filename="../progressloggergui.cpp" line="113"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="102"/>
+        <location filename="../progressloggergui.cpp" line="95"/>
         <source>&amp;Abort</source>
         <translation>&amp;取消</translation>
     </message>
@@ -1322,405 +1338,352 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/detect.cpp" line="110"/>
+        <location filename="../base/detect.cpp" line="111"/>
         <source>Guest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="113"/>
+        <location filename="../base/detect.cpp" line="114"/>
         <source>Admin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="116"/>
+        <location filename="../base/detect.cpp" line="117"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="119"/>
+        <location filename="../base/detect.cpp" line="120"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="226"/>
+        <location filename="../base/detect.cpp" line="228"/>
         <source>(no description available)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="398"/>
+        <location filename="../base/detect.cpp" line="400"/>
         <source>&lt;li&gt;Permissions insufficient for bootloader installation.
 Administrator priviledges are necessary.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="409"/>
+        <location filename="../base/detect.cpp" line="411"/>
         <source>&lt;li&gt;Target mismatch detected.
 Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/detect.cpp" line="413"/>
+        <location filename="../base/detect.cpp" line="416"/>
         <source>Problem detected:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RbSpeexCfgFrm</name>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">設置</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="19"/>
-        <source>Configure RbSpeex Encoder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="38"/>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="45"/>
-        <source>Narrowband</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="68"/>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="85"/>
-        <source>Complexity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="115"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="125"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;取消</translation>
-    </message>
-    <message>
-        <location filename="../rbspeexcfgfrm.ui" line="95"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>File</source>
         <translation>文件</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="79"/>
+        <location filename="../rbutilqt.cpp" line="84"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="243"/>
+        <location filename="../rbutilqt.cpp" line="251"/>
         <source>Network error: %1. Please check your network and proxy settings.</source>
         <translation>网絡錯誤： %1. 請檢查你的网絡和代理服務的設置.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="345"/>
+        <location filename="../rbutilqt.cpp" line="352"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; 在 &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="362"/>
+        <location filename="../rbutilqt.cpp" line="371"/>
         <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;PDF 用戶手冊(英文)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="364"/>
+        <location filename="../rbutilqt.cpp" line="373"/>
         <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;HTML 用戶手冊(英文,在瀏覽器打開)&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="367"/>
+        <location filename="../rbutilqt.cpp" line="376"/>
         <source>Select a device for a link to the correct manual</source>
         <translation>請選擇你的播放器</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="369"/>
+        <location filename="../rbutilqt.cpp" line="378"/>
         <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
         <translation>&lt;a href=&apos;%1&apos;&gt;用戶手冊總觀&lt;/a&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="868"/>
+        <location filename="../rbutilqt.cpp" line="887"/>
         <source>Confirm Installation</source>
         <translation>确認安裝</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1066"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Mount point is wrong!</source>
         <translation>Mountpoint 錯誤!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="607"/>
+        <location filename="../rbutilqt.cpp" line="622"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>你确認要安裝啟動程序?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="789"/>
+        <location filename="../rbutilqt.cpp" line="800"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>你确認要安裝字體包裹嗎?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="834"/>
+        <location filename="../rbutilqt.cpp" line="849"/>
         <source>Do you really want to install the voice file?</source>
         <translation>你确認要安裝語音文件嗎?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="869"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>你确認要安裝游戲附件嗎?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="949"/>
+        <location filename="../rbutilqt.cpp" line="969"/>
         <source>Confirm Uninstallation</source>
         <translation>确認安裝</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="970"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>你确認要卸載啟動程序嗎?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1007"/>
+        <location filename="../rbutilqt.cpp" line="1028"/>
         <source>Confirm download</source>
         <translation>确認下載</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1009"/>
+        <location filename="../rbutilqt.cpp" line="1030"/>
         <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
         <translation>你确認要下載用戶手冊嗎? 用戶手冊將會被放在你播放器的主目錄里.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1052"/>
+        <location filename="../rbutilqt.cpp" line="1077"/>
         <source>Confirm installation</source>
         <translation>确認安裝</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1054"/>
+        <location filename="../rbutilqt.cpp" line="1079"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>你确認要安裝Rockbox安裝程序到你的播放器上嗎? 安裝后你可以從你播放器上運行此程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1062"/>
+        <location filename="../rbutilqt.cpp" line="1087"/>
         <source>Installing Rockbox Utility</source>
         <translation>安裝 Rockbox安裝程序</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1077"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Error installing Rockbox Utility</source>
         <translation>安裝 Rockbox安裝程序錯誤!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1081"/>
+        <location filename="../rbutilqt.cpp" line="1109"/>
         <source>Installing user configuration</source>
         <translation>安裝用戶設置</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1084"/>
+        <location filename="../rbutilqt.cpp" line="1113"/>
         <source>Error installing user configuration</source>
         <translation>安裝用戶設置錯誤</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1088"/>
+        <location filename="../rbutilqt.cpp" line="1117"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>成功安裝 Rockbox安裝程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1178"/>
+        <location filename="../rbutilqt.cpp" line="1207"/>
         <source>Configuration error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="863"/>
+        <location filename="../rbutilqt.cpp" line="882"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="864"/>
+        <location filename="../rbutilqt.cpp" line="883"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1180"/>
+        <location filename="../rbutilqt.cpp" line="1209"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="210"/>
+        <location filename="../rbutilqt.cpp" line="215"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="528"/>
+        <location filename="../rbutilqt.cpp" line="539"/>
         <source>Aborted!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="537"/>
+        <location filename="../rbutilqt.cpp" line="548"/>
         <source>Installed Rockbox detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="538"/>
+        <location filename="../rbutilqt.cpp" line="549"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="562"/>
+        <location filename="../rbutilqt.cpp" line="574"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="827"/>
+        <location filename="../rbutilqt.cpp" line="842"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="829"/>
+        <location filename="../rbutilqt.cpp" line="844"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="541"/>
+        <location filename="../rbutilqt.cpp" line="552"/>
         <source>Starting backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="207"/>
+        <location filename="../rbutilqt.cpp" line="212"/>
         <source>New installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
+        <location filename="../rbutilqt.cpp" line="223"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="558"/>
+        <location filename="../rbutilqt.cpp" line="570"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="171"/>
+        <location filename="../rbutilqt.cpp" line="176"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="172"/>
+        <location filename="../rbutilqt.cpp" line="177"/>
         <source>Can&apos;t get version information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="525"/>
+        <location filename="../rbutilqt.cpp" line="536"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="641"/>
+        <location filename="../rbutilqt.cpp" line="656"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="665"/>
+        <location filename="../rbutilqt.cpp" line="683"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="666"/>
+        <location filename="../rbutilqt.cpp" line="684"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="687"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="692"/>
+        <location filename="../rbutilqt.cpp" line="711"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="713"/>
         <source>Browse backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="707"/>
+        <location filename="../rbutilqt.cpp" line="726"/>
         <source>Prerequisites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
-        <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="729"/>
+        <location filename="../rbutilqt.cpp" line="739"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="731"/>
+        <location filename="../rbutilqt.cpp" line="741"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="749"/>
+        <location filename="../rbutilqt.cpp" line="759"/>
         <source>Backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="760"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="779"/>
+        <location filename="../rbutilqt.cpp" line="790"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="978"/>
+        <location filename="../rbutilqt.cpp" line="998"/>
         <source>No uninstall method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="382"/>
+        <location filename="../rbutilqt.cpp" line="391"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="440"/>
+        <location filename="../rbutilqt.cpp" line="449"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="671"/>
+        <location filename="../rbutilqt.cpp" line="689"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="723"/>
+        <location filename="../rbutilqt.cpp" line="732"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2130,59 +2093,6 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
-    <name>SapiCfgFrm</name>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">設置</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="62"/>
-        <source>TTS options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="25"/>
-        <source>Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="87"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="107"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="117"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;取消</translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="35"/>
-        <source>Voice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="45"/>
-        <source>Speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sapicfgfrm.ui" line="129"/>
-        <source>Use Sapi 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Sysinfo</name>
     <message>
         <location filename="../sysinfo.cpp" line="41"/>
@@ -2241,150 +2151,86 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../tts.cpp" line="165"/>
+        <location filename="../base/tts.cpp" line="139"/>
         <source>TTS executable not found</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSExesCfgFrm</name>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">設置</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="19"/>
-        <source>Configure TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="31"/>
-        <source>Path to TTS Engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="43"/>
-        <source>&amp;Browse</source>
-        <translation type="unfinished">&amp;瀏覽</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="52"/>
-        <source>TTS options</source>
+        <location filename="../base/tts.cpp" line="113"/>
+        <source>Path to TTS engine:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsexescfgfrm.ui" line="77"/>
-        <source>Reset</source>
+        <location filename="../base/tts.cpp" line="115"/>
+        <source>TTS engine options:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="97"/>
-        <source>&amp;Ok</source>
-        <translation type="unfinished">&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../ttsexescfgfrm.ui" line="107"/>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;取消</translation>
-    </message>
 </context>
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../tts.cpp" line="401"/>
-        <source>Starting festival</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../tts.cpp" line="450"/>
+        <location filename="../base/tts.cpp" line="491"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="527"/>
+        <location filename="../base/tts.cpp" line="561"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalCfgFrm</name>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="13"/>
-        <source>Configuration</source>
-        <translation type="unfinished">設置</translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="44"/>
-        <source>Executables</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="73"/>
-        <source>Path to Festival server</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="132"/>
-        <source>Browse</source>
+        <location filename="../base/tts.cpp" line="381"/>
+        <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="109"/>
-        <source>Path to Festival client</source>
+        <location filename="../base/tts.cpp" line="385"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="182"/>
-        <source>Server voice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ttsfestivalcfgform.ui" line="209"/>
-        <source>Select a voice</source>
+        <location filename="../base/tts.cpp" line="392"/>
+        <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TTSSapi</name>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="222"/>
-        <source>&amp;Refresh</source>
+        <location filename="../base/tts.cpp" line="238"/>
+        <source>Could not copy the Sapi-script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsfestivalcfgform.ui" line="262"/>
-        <source>Show voice description</source>
+        <location filename="../base/tts.cpp" line="259"/>
+        <source>Could not start the Sapi-script</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSFestivalGui</name>
     <message>
-        <location filename="../ttsgui.cpp" line="321"/>
-        <source>Loading..</source>
+        <location filename="../base/tts.cpp" line="185"/>
+        <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ttsgui.cpp" line="336"/>
-        <source>Querying festival</source>
+        <location filename="../base/tts.cpp" line="190"/>
+        <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TTSSapi</name>
     <message>
-        <location filename="../tts.cpp" line="233"/>
-        <source>Could not copy the Sapi-script</source>
+        <location filename="../base/tts.cpp" line="195"/>
+        <source>Speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../tts.cpp" line="254"/>
-        <source>Could not start the Sapi-script</source>
+        <location filename="../base/tts.cpp" line="198"/>
+        <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../talkfile.cpp" line="40"/>
+        <location filename="../talkfile.cpp" line="41"/>
         <source>Starting Talk file generation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2394,62 +2240,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="60"/>
+        <location filename="../talkfile.cpp" line="59"/>
         <source>Init of Encoder engine failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="393"/>
+        <location filename="../talkfile.cpp" line="392"/>
         <source>Talk file creation aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="313"/>
+        <location filename="../talkfile.cpp" line="312"/>
         <source>Encoding of %1 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="147"/>
+        <location filename="../talkfile.cpp" line="146"/>
         <source>Finished creating Talk files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="72"/>
+        <location filename="../talkfile.cpp" line="71"/>
         <source>Reading Filelist...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="107"/>
+        <location filename="../talkfile.cpp" line="106"/>
         <source>Voicing entries...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="116"/>
+        <location filename="../talkfile.cpp" line="115"/>
         <source>Encoding files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="124"/>
+        <location filename="../talkfile.cpp" line="123"/>
         <source>Copying Talkfile for Dirs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="133"/>
+        <location filename="../talkfile.cpp" line="132"/>
         <source>Copying Talkfile for Files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="417"/>
+        <location filename="../talkfile.cpp" line="416"/>
         <source>Copying of %1 to %2 failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="439"/>
+        <location filename="../talkfile.cpp" line="438"/>
         <source>Cleaning up..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../talkfile.cpp" line="275"/>
+        <location filename="../talkfile.cpp" line="274"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2495,97 +2341,97 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="35"/>
+        <location filename="../themesinstallwindow.cpp" line="36"/>
         <source>no theme selected</source>
         <translation>沒有選擇主題</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="102"/>
+        <location filename="../themesinstallwindow.cpp" line="103"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>网絡錯誤： %1. 
 請檢查你的网絡和代理服務的設置.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="118"/>
+        <location filename="../themesinstallwindow.cpp" line="120"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="180"/>
+        <location filename="../themesinstallwindow.cpp" line="188"/>
         <source>fetching details for %1</source>
         <translation>正在拿取 %1 的細節</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="182"/>
+        <location filename="../themesinstallwindow.cpp" line="190"/>
         <source>fetching preview ...</source>
         <translation>正在拿取預覽...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="193"/>
+        <location filename="../themesinstallwindow.cpp" line="203"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;作者:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="196"/>
+        <location filename="../themesinstallwindow.cpp" line="206"/>
         <source>unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="195"/>
+        <location filename="../themesinstallwindow.cpp" line="205"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;版本:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="207"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;描述:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="198"/>
+        <location filename="../themesinstallwindow.cpp" line="208"/>
         <source>no description</source>
         <translation>無描述</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="239"/>
+        <location filename="../themesinstallwindow.cpp" line="251"/>
         <source>no theme preview</source>
         <translation>無主題預覽</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="270"/>
+        <location filename="../themesinstallwindow.cpp" line="282"/>
         <source>getting themes information ...</source>
         <translation>正在拿取主題信息...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="318"/>
+        <location filename="../themesinstallwindow.cpp" line="330"/>
         <source>Mount point is wrong!</source>
         <translation>Mountpoint 錯誤!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="113"/>
+        <location filename="../themesinstallwindow.cpp" line="115"/>
         <source>the following error occured:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="36"/>
+        <location filename="../themesinstallwindow.cpp" line="37"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="149"/>
+        <location filename="../themesinstallwindow.cpp" line="157"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="166"/>
+        <location filename="../themesinstallwindow.cpp" line="174"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="228"/>
+        <location filename="../themesinstallwindow.cpp" line="240"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -2594,87 +2440,87 @@ HTTP response code: %1</source>
 <context>
     <name>UnZip</name>
     <message>
-        <location filename="../zip/unzip.cpp" line="245"/>
+        <location filename="../zip/unzip.cpp" line="250"/>
         <source>ZIP operation completed successfully.</source>
         <translation>成功完成 ZIP 程序.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="246"/>
+        <location filename="../zip/unzip.cpp" line="251"/>
         <source>Failed to initialize or load zlib library.</source>
         <translation>初始化zlib失敗.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="247"/>
+        <location filename="../zip/unzip.cpp" line="252"/>
         <source>zlib library error.</source>
         <translation>zlib錯誤.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="248"/>
+        <location filename="../zip/unzip.cpp" line="253"/>
         <source>Unable to create or open file.</source>
         <translation>無法建立或打開文件.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="249"/>
+        <location filename="../zip/unzip.cpp" line="254"/>
         <source>Partially corrupted archive. Some files might be extracted.</source>
         <translation>壓縮文件部分損坏. 一些文件可能可以被恢复. </translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="250"/>
+        <location filename="../zip/unzip.cpp" line="255"/>
         <source>Corrupted archive.</source>
         <translation>壓縮文件損坏.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="251"/>
+        <location filename="../zip/unzip.cpp" line="256"/>
         <source>Wrong password.</source>
         <translation>密碼不正确.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="252"/>
+        <location filename="../zip/unzip.cpp" line="257"/>
         <source>No archive has been created yet.</source>
         <translation>壓縮文件還沒有被建立.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="253"/>
+        <location filename="../zip/unzip.cpp" line="258"/>
         <source>File or directory does not exist.</source>
         <translation>文件或文件夾不存在.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="254"/>
+        <location filename="../zip/unzip.cpp" line="259"/>
         <source>File read error.</source>
         <translation>文件讀取錯誤.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="255"/>
+        <location filename="../zip/unzip.cpp" line="260"/>
         <source>File write error.</source>
         <translation>文件寫入錯誤.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="256"/>
+        <location filename="../zip/unzip.cpp" line="261"/>
         <source>File seek error.</source>
         <translation>文件內尋找錯誤.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="257"/>
+        <location filename="../zip/unzip.cpp" line="262"/>
         <source>Unable to create a directory.</source>
         <translation>無法建立文件夾.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="258"/>
+        <location filename="../zip/unzip.cpp" line="263"/>
         <source>Invalid device.</source>
         <translation>無效播放器.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="259"/>
+        <location filename="../zip/unzip.cpp" line="264"/>
         <source>Invalid or incompatible zip archive.</source>
         <translation>無效或不支持壓縮文件.</translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="260"/>
+        <location filename="../zip/unzip.cpp" line="265"/>
         <source>Inconsistent headers. Archive might be corrupted.</source>
         <translation>文件頭不正常. 壓縮文件可能已損坏. </translation>
     </message>
     <message>
-        <location filename="../zip/unzip.cpp" line="264"/>
+        <location filename="../zip/unzip.cpp" line="269"/>
         <source>Unknown error.</source>
         <translation>不明錯誤.</translation>
     </message>
@@ -2758,37 +2604,37 @@ HTTP response code: %1</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../voicefile.cpp" line="42"/>
+        <location filename="../voicefile.cpp" line="43"/>
         <source>Starting Voicefile generation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="102"/>
+        <location filename="../voicefile.cpp" line="104"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">下載錯誤: 接到 HTTP 錯誤 %1. </translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="107"/>
+        <location filename="../voicefile.cpp" line="109"/>
         <source>Cached file used.</source>
         <translation type="unfinished">使用緩沖文件.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="109"/>
+        <location filename="../voicefile.cpp" line="111"/>
         <source>Download error: %1</source>
         <translation type="unfinished">下載錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="114"/>
+        <location filename="../voicefile.cpp" line="116"/>
         <source>Download finished.</source>
         <translation type="unfinished">完成下載.</translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="123"/>
+        <location filename="../voicefile.cpp" line="125"/>
         <source>failed to open downloaded file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="137"/>
+        <location filename="../voicefile.cpp" line="138"/>
         <source>Init of TTS engine failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2823,7 +2669,7 @@ HTTP response code: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../voicefile.cpp" line="56"/>
+        <location filename="../voicefile.cpp" line="57"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2884,72 +2730,72 @@ HTTP response code: %1</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../installzip.cpp" line="53"/>
+        <location filename="../base/zipinstaller.cpp" line="59"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="61"/>
+        <location filename="../base/zipinstaller.cpp" line="67"/>
         <source>Installation finished successfully.</source>
         <translation>成功完成安裝.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="76"/>
+        <location filename="../base/zipinstaller.cpp" line="80"/>
         <source>Downloading file %1.%2</source>
         <translation>正在下載文件 %1.%2</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="115"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>下載錯誤: 接到 HTTP 錯誤 %1. </translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="119"/>
+        <location filename="../base/zipinstaller.cpp" line="120"/>
         <source>Cached file used.</source>
         <translation>使用緩沖文件.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="121"/>
+        <location filename="../base/zipinstaller.cpp" line="122"/>
         <source>Download error: %1</source>
         <translation>下載錯誤: %1</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="126"/>
         <source>Download finished.</source>
         <translation>完成下載.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="132"/>
         <source>Extracting file.</source>
         <translation>正在解壓文件.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="143"/>
+        <location filename="../base/zipinstaller.cpp" line="142"/>
         <source>Opening archive failed: %1.</source>
         <translation>打開壓縮文件錯誤: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="166"/>
+        <location filename="../base/zipinstaller.cpp" line="161"/>
         <source>Extracting failed: %1.</source>
         <translation>解壓錯誤: %1.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="179"/>
+        <location filename="../base/zipinstaller.cpp" line="171"/>
         <source>Installing file.</source>
         <translation>正在安裝文件.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="190"/>
+        <location filename="../base/zipinstaller.cpp" line="182"/>
         <source>Installing file failed.</source>
         <translation>安裝文件失敗.</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="200"/>
+        <location filename="../base/zipinstaller.cpp" line="191"/>
         <source>Creating installation log</source>
         <translation>正在建立安裝日志</translation>
     </message>
     <message>
-        <location filename="../installzip.cpp" line="155"/>
+        <location filename="../base/zipinstaller.cpp" line="152"/>
         <source>Not enough disk space! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2977,12 +2823,12 @@ HTTP response code: %1</source>
         <translation>&amp;特別鳴謝</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="124"/>
+        <location filename="../aboutbox.ui" line="127"/>
         <source>&amp;License</source>
         <translation>&amp;授權</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="157"/>
+        <location filename="../aboutbox.ui" line="169"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>