Rockbox Utility translation updates.

- Update german translation.
- lupdate all other translations and drop obsolete strings.

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

16 files changed, 1136 insertions, 1349 deletions

diff --git a/rbutil/rbutilqt/lang/rbutil_cs.ts b/rbutil/rbutilqt/lang/rbutil_cs.ts
index 150b9cf..85a6b81 100644
--- a/rbutil/rbutilqt/lang/rbutil_cs.ts
+++ b/rbutil/rbutilqt/lang/rbutil_cs.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished">Stahuje se soubor zavaděče</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Úspěch: modifikovaný soubor firmwaru vytvořen</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1727,51 +1727,6 @@ Prosím nastavte TTS engine.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Host</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Administrátor</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Uživatel</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(žádný popis není k dispozici)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
-Administrator priviledges are necessary.&lt;/li&gt;</source>
-        <translation>&lt;li&gt;Nedostatečná oprávnění pro instalaci zavaděče.
-Jsou nutná administrátorská práva.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="196"/>
-        <source>&lt;li&gt;Target mismatch detected.
-Installed target: %1, selected target: %2.&lt;/li&gt;</source>
-        <translation>&lt;li&gt;Zjištěn nesoulad cíle cíle.
-Instalovaný cíl: %1, vybraný cíl: %2.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>Detekován problém:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1797,10 +1752,6 @@ Instalovaný cíl: %1, vybraný cíl: %2.&lt;/li&gt;</translation>
         <translation>Chyba sítě</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Nelze získat informaci o verzi.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="329"/>
         <source>New installation</source>
         <translation>Nová instalace</translation>
@@ -1822,10 +1773,6 @@ Instalovaný cíl: %1, vybraný cíl: %2.&lt;/li&gt;</translation>
         <translation>Vaše nastavení je neplatné. Pravděpodobně kvůli změně cesty k zařízení. Nyní se otevře okno nastavení, které vám dovolí opravit problém.</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Chyba sítě: %1. Prosím zkontrolujte nastavení sítě a proxy.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="85"/>
         <source>Wine detected!</source>
         <translation type="unfinished"></translation>
@@ -2112,10 +2059,6 @@ Stiskněte &quot;Ne&quot; pro přeskočení tohoto kroku.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Neznámý způsob odinstalace.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="1072"/>
         <source>Confirm download</source>
         <translation>Potvrdit stahování</translation>
@@ -2719,6 +2662,35 @@ Stiskněte &quot;Ne&quot; pro přeskočení tohoto kroku.</translation>
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Host</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Administrátor</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Uživatel</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Chyba</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(žádný popis není k dispozici)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3230,6 +3202,28 @@ Kód HTTP odpovědi: %1</translation>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Nedostatečná oprávnění pro instalaci zavaděče.
+Jsou nutná administrátorská práva.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Zjištěn nesoulad cíle cíle.
+Instalovaný cíl: %1, vybraný cíl: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Detekován problém:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_de.ts b/rbutil/rbutilqt/lang/rbutil_de.ts
index 7343f57..2875f98 100644
--- a/rbutil/rbutilqt/lang/rbutil_de.ts
+++ b/rbutil/rbutilqt/lang/rbutil_de.ts
@@ -319,7 +319,7 @@
     <message>
         <location filename="../base/bootloaderinstallhex.cpp" line="225"/>
         <source>Uninstallation not possible, only installation info removed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Deinstallation nicht möglich, Installationsinformationen entfernt</translation>
     </message>
     <message>
         <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
@@ -437,7 +437,7 @@ Siehe http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
     <message>
         <location filename="../base/bootloaderinstallipod.cpp" line="231"/>
         <source>Error: could not retrieve device name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fehler: konnte Gerätenamen nicht ermitteln</translation>
     </message>
     <message>
         <location filename="../base/bootloaderinstallipod.cpp" line="247"/>
@@ -533,7 +533,7 @@ Siehe http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
     <message>
         <location filename="../base/bootloaderinstallmpio.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (bin 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/MPIOHD200Port&apos;&gt;MPIOHD200Port&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>
+        <translation type="unfinished">Die Bootloader-Installation benötigt eine Firmware-Datei der originalen Firmware (bin-Datei). Diese Datei muss aus rechtlichen Gründen separat heruntergeladen werden. Informationen wie diese Datei heruntergeladen werden kann ist 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/MPIO200Port&apos;&gt;MPIO200Port&lt;/a&gt; aufgeführt.&lt;br/&gt;OK um fortzufahren und die Datei auf dem Computer auszuwählen.</translation>
     </message>
     <message>
         <location filename="../base/bootloaderinstallmpio.cpp" line="52"/>
@@ -541,68 +541,68 @@ Siehe http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
         <translation type="unfinished">Lade Bootloader-Datei herunter</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konnte Firmware-Datei nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konnte Firmware-Datei nicht lesen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
+        <translation type="unfinished">Geladene Firmware-Datei scheint keine MPIO Firmware-Datei zu sein.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
+        <translation type="unfinished">Konnte Ausgabedatei nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
+        <translation type="unfinished">Kann Ausgabedatei nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
+        <translation type="unfinished">Unbekannter Fehler Nummer: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
+        <translation type="unfinished">Kann heruntergeladenen Bootloader nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
+        <translation type="unfinished">Zielbereich für Bootloader in Original-Firmware nicht leer.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
+        <translation type="unfinished">Konnte heruntergeladenen Bootloader nicht lesen.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
-        <translation type="unfinished"></translation>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
+        <translation type="unfinished">Prüfsummenfehler im Bootloader.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Patchen der Original-Firmware fehlgeschlagen: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Erfolg: modifizierte Firmware-Datei erzeugt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished">Zum deinstallieren ein Upgrade mit einer unveränderten Originalfirmware-Datei durchführen</translation>
     </message>
@@ -679,7 +679,7 @@ Siehe http://www.rockbox.org/wiki/SansaE200Install
     <message>
         <location filename="../base/bootloaderinstallsansa.cpp" line="247"/>
         <source>Error: could not retrieve device name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fehler: konnte Gerätenamen nicht ermitteln</translation>
     </message>
     <message>
         <location filename="../base/bootloaderinstallsansa.cpp" line="263"/>
@@ -925,7 +925,7 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
     <message>
         <location filename="../configure.cpp" line="149"/>
         <source>Mountpoint is not a directory.</source>
-        <translation>Einhängepunkt ist kein Verzeichnis</translation>
+        <translation type="unfinished">Einhängepunkt ist kein Verzeichnis.</translation>
     </message>
     <message>
         <location filename="../configure.cpp" line="153"/>
@@ -965,13 +965,14 @@ Das Gerät muss für die Installation in den UMS-Modus umgestellt werden.</trans
     <message>
         <location filename="../configure.cpp" line="469"/>
         <source>Proxy Detection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Proxy-Erkennung</translation>
     </message>
     <message>
         <location filename="../configure.cpp" line="470"/>
         <source>The System Proxy settings are invalid!
 Rockbox Utility can&apos;t work with this proxy settings. Make sure the system proxy is set correctly. Note that &quot;proxy auto-config (PAC)&quot; scripts are not supported by Rockbox Utility. If your system uses this you need to use manual proxy settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Die System-Proxy-Werte sind ungültig!
+Rockbox Utility kann mit diesen Proxy-Einstellungen nicht arbeiten. Bitte sicherstellen dass die Proxy-Einstellungen im System korrekt sind. Hinweis: &quot;Proxy Auto-Konfiguration (PAC)&quot;-Skripte werden von Rockbox Utility nicht unterstützt. Sofern das System dies benutzt muss der Proxy manuell angegeben werden.</translation>
     </message>
     <message>
         <location filename="../configure.cpp" line="571"/>
@@ -1728,64 +1729,15 @@ Please configure TTS engine.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Gast</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Admin</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Benutzer</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(keine Beschreibung verfügbar)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>Problem gefunden:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>LTR</translation>
     </message>
 </context>
 <context>
     <name>RbUtilQt</name>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Netzwerkfehler: %1. Bitte Netzwerk und Proxyeinstellungen überprüfen.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="377"/>
         <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>
@@ -1829,12 +1781,12 @@ Installiertes Gerät: %1, gewähltes Gerät: %2.&lt;/li&gt;</translation>
         <location filename="../rbutilqt.cpp" line="805"/>
         <location filename="../rbutilqt.cpp" line="883"/>
         <source>No Rockbox installation found</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Rockbox-Installation gefunden</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="806"/>
         <source>Could not determine the installed Rockbox version. Please install a Rockbox build before installing fonts.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konnte die installierte Rockbox-Version nicht herausfinden. Bitte vor der Installation der Schriften Rockbox installieren.</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="812"/>
@@ -1844,7 +1796,7 @@ Installiertes Gerät: %1, gewähltes Gerät: %2.&lt;/li&gt;</translation>
     <message>
         <location filename="../rbutilqt.cpp" line="884"/>
         <source>Could not determine the installed Rockbox version. Please install a Rockbox build before installing voice files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Konnte die installierte Rockbox-Version nicht herausfinden. Bitte vor der Installation der Sprachdatei Rockbox installieren.</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="899"/>
@@ -1869,12 +1821,12 @@ Installiertes Gerät: %1, gewähltes Gerät: %2.&lt;/li&gt;</translation>
     <message>
         <location filename="../rbutilqt.cpp" line="1036"/>
         <source>No uninstall method for this target known.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Keine Deinstallationsmethode für dieses Gerät verfügbar.</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="1042"/>
         <source>Rockbox Utility can not uninstall the bootloader on this target.Try a normal firmware update to remove the booloader.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rockbox Utility kann den Bootloader auf diesem Gerät nicht entfernen. Bitte ein reguläres Firmware-Update versuchen um den Bootloader zu installieren.</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="1072"/>
@@ -1904,12 +1856,12 @@ Installiertes Gerät: %1, gewähltes Gerät: %2.&lt;/li&gt;</translation>
     <message>
         <location filename="../rbutilqt.cpp" line="1337"/>
         <source>New version of Rockbox Utility available.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Neue Version von Rockbox Utility verfügbar.</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="1340"/>
         <source>Rockbox Utility is up to date.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rockbox Utility ist aktuell.</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="499"/>
@@ -1976,19 +1928,20 @@ Installiertes Gerät: %1, gewähltes Gerät: %2.&lt;/li&gt;</translation>
     <message>
         <location filename="../rbutilqt.cpp" line="85"/>
         <source>Wine detected!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wine entdeckt!</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="86"/>
         <source>It seems you are trying to run this program under Wine. Please don&apos;t do this, running under Wine will fail. Use the native Linux binary instead.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Es scheint so als ob dieses Programm mit Wine ausgeführt wird. Bitte dies nicht tun, es wird fehlschlagen. Stattdessen die native Linux-Version verwenden.</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="218"/>
         <location filename="../rbutilqt.cpp" line="249"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kann Versions-Informationen nicht laden.
+Netzwerkfehler: %1. Bitte Netzwerk und Proxy-Einstellungen überprüfen.</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="567"/>
@@ -2059,10 +2012,6 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished">Konnte Versionsinformationen nicht ermitteln!</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Konnte Versionsinformationen nicht laden.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="259"/>
         <source>Download build information finished.</source>
         <translation type="unfinished">Informationen über Builds heruntergeladen.</translation>
@@ -2135,10 +2084,6 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Manuelle Schritte erforderlich</translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Keine Deinstallationsmethode bekannt.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="421"/>
         <source>Do you really want to perform a complete installation?
 
@@ -2167,7 +2112,7 @@ This will install Rockbox %1. To install the most recent development build avail
     <message>
         <location filename="../rbutilqt.cpp" line="1274"/>
         <source>Checking for update ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Prüfe auf Update ...</translation>
     </message>
     <message>
         <location filename="../rbutilqt.cpp" line="1334"/>
@@ -2718,6 +2663,35 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Gast</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Admin</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Benutzer</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(keine Beschreibung verfügbar)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3228,6 +3202,28 @@ HTTP Antwortcode: %1</translation>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Bereichtigung für Bootloader-Installation nicht ausreichend.
+Administratorrechte sind notwendig.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&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/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Problem gefunden:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_fi.ts b/rbutil/rbutilqt/lang/rbutil_fi.ts
index a623747..6dc3213 100644
--- a/rbutil/rbutilqt/lang/rbutil_fi.ts
+++ b/rbutil/rbutilqt/lang/rbutil_fi.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1717,49 +1717,6 @@ Valitse laite ja liitospiste käsin.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Vieras</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Pääkäyttäjä</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Käyttäjä</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>virhe</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(ei kuvausta saatavilla)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1800,11 +1757,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>Asetuksesi eivät ole kunnossa. Yleensä tämä johtuu vaihtuneesta laitteen osoitteesta. Asetusikkuna aukeaa, voit korjata asetukset siitä.</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Verkkovirhe: %1
-Tarkista verkko- ja välityspalvelinasetukset.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="205"/>
         <location filename="../rbutilqt.cpp" line="238"/>
         <source>Downloading build information, please wait ...</source>
@@ -2695,6 +2647,35 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Vieras</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Pääkäyttäjä</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Käyttäjä</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(ei kuvausta saatavilla)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3203,6 +3184,26 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <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/utils.cpp" line="196"/>
+        <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/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_fr.ts b/rbutil/rbutilqt/lang/rbutil_fr.ts
index d6bfe6f..a5ac3d8 100644
--- a/rbutil/rbutilqt/lang/rbutil_fr.ts
+++ b/rbutil/rbutilqt/lang/rbutil_fr.ts
@@ -543,68 +543,68 @@ Veuillez vous référer à http://www.rockbox.org/wiki/IpodConversionToFAT32</tr
         <translation type="unfinished">Téléchargement du bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Le firmware a été modifié avec succès</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished">Pour le désinstaller, faites une mise à jour normale avec un firmware non modifié</translation>
     </message>
@@ -1736,50 +1736,6 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Invité</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Administrateur</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Utilisateur</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>Erreur</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(aucune description disponible)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
-Administrator priviledges are necessary.&lt;/li&gt;</source>
-        <translation>&lt;li&gt;Permissions insuffisantes pour installation le bootloader.
-Les privilèges administrateurs sont recquis.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>Problème détecté:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1816,10 +1772,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>Le téléchargement des informations de version est terminé.</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Erreur réseau: %1. Veuillez vérifier vos paramètres réseau et proxy.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="377"/>
         <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>
@@ -2086,10 +2038,6 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>Erreur de réseau</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Impossible de récupérer les informations de version.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="563"/>
         <source>Really continue?</source>
         <translation>Êtes vous sûr de vouloir poursuivre ?</translation>
@@ -2157,10 +2105,6 @@ Appuyez sur &quot;Non&quot; pour ignorez cette étape.</translation>
         <translation>Des étapes manuelles sont nécessaire</translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Aucune méthode de suppression n&apos;est connue.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="421"/>
         <source>Do you really want to perform a complete installation?
 
@@ -2727,6 +2671,35 @@ Ceci installera Rockbox %1. Pour installer la version en cours de développement
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Invité</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Administrateur</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(aucune description disponible)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3237,6 +3210,27 @@ Code de réponse HHTP: %1</translation>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Permissions insuffisantes pour installation le bootloader.
+Les privilèges administrateurs sont recquis.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="196"/>
+        <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/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Problème détecté:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_gr.ts b/rbutil/rbutilqt/lang/rbutil_gr.ts
index b1d0b15..efc04cd 100644
--- a/rbutil/rbutilqt/lang/rbutil_gr.ts
+++ b/rbutil/rbutilqt/lang/rbutil_gr.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished">Λήψη αρχείου bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Επιτυχία: Τροποποιημένο αρχείο firmware δημιουργήθηκε</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1724,51 +1724,6 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Επισκέπτης</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Διαχειριστής</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Χρήστης</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>Σφάλμα</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(δεν υπάρχει διαθέσιμη περιγραφή)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>Εντοπίστηκε πρόβλημα:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1809,10 +1764,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>Οι ρυθμίσεις σας δεν είναι έγκυρες. Πιθανότατα αυτό συμβαίνει λόγο αλλαγής διαδρομής της συσκευής. Το παράθυρο ρυθμίσεων θα εμφανισθεί τώρα για να σας επιτρέψει να διορθώσετε το πρόβλημα.</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Σφάλμα δικτύου: %1. Παρακαλώ ελέγξτε τις ρυθμίσεις δικτύου.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="85"/>
         <source>Wine detected!</source>
         <translation type="unfinished"></translation>
@@ -2075,10 +2026,6 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>Σφάλμα δικτύου</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Αδύνατη λήψη πληροφοριών έκδοσης.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="563"/>
         <source>Really continue?</source>
         <translation>Σίγουρα θέλετε να συνεχίσετε;</translation>
@@ -2146,10 +2093,6 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Απαιτούνται χειροκίνητα βήματα</translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Δεν είναι γνωστή κάποια μέθοδος εγκατάστασης.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="421"/>
         <source>Do you really want to perform a complete installation?
 
@@ -2717,6 +2660,35 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Επισκέπτης</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Διαχειριστής</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Χρήστης</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Σφάλμα</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(δεν υπάρχει διαθέσιμη περιγραφή)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3226,6 +3198,28 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Ανεπαρκή δικαιώματα για την εγκατάσταση του bootloader.
+Απαιτούνται δικαιώματα διαχειριστή.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Βρέθηκε αναντιστοιχία συσκευών.
+Εγκατεστημένη συσκευή: %1, επιλεγμένη συσκευή: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Εντοπίστηκε πρόβλημα:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_he.ts b/rbutil/rbutilqt/lang/rbutil_he.ts
index 78a4307..b370854 100644
--- a/rbutil/rbutilqt/lang/rbutil_he.ts
+++ b/rbutil/rbutilqt/lang/rbutil_he.ts
@@ -2,81 +2,6 @@
 <!DOCTYPE TS>
 <TS version="2.0" language="he">
 <context>
-    <name></name>
-    <message>
-        <source>Can&apos;t open file %s!</source>
-        <translation type="obsolete">לא מצליח לפתוח קובץ %s!</translation>
-    </message>
-    <message>
-        <source>Bootloader size is %d bytes</source>
-        <translation type="obsolete">גודלו של מנהל האיתחול הוא %d בתים</translation>
-    </message>
-    <message>
-        <source>Firmware size is %d bytes</source>
-        <translation type="obsolete">גודלה של הקושחה הוא %d בתים</translation>
-    </message>
-    <message>
-        <source>Can&apos;t allocate %d bytes!</source>
-        <translation type="obsolete">לא יכול להקצות %d בתים!</translation>
-    </message>
-    <message>
-        <source>Reading %s into memory...</source>
-        <translation type="obsolete">קורא את %s אל הזיכרון...</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read file %s to memory!</source>
-        <translation type="obsolete">לא יכול לקרוא את %s אל הזיכרון!</translation>
-    </message>
-    <message>
-        <source>File %s isn&apos;t a valid ChinaChip firmware!</source>
-        <translation type="obsolete">הקובץ %s אינו קובץ קושחת ChinaChip תקין!</translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t find ccpmp.bin in %s!</source>
-        <translation type="obsolete">לא מוצא את ccpmp.bin בתוך %s!</translation>
-    </message>
-    <message>
-        <source>Found ccpmp.bin at %d bytes</source>
-        <translation type="obsolete">מצאתי את ccpmp.bin ב- %d בתים</translation>
-    </message>
-    <message>
-        <source>Writing %d bytes to %s...</source>
-        <translation type="obsolete">כותב %d בתים אל %s...</translation>
-    </message>
-    <message>
-        <source>Can&apos;t write to file %s!</source>
-        <translation type="obsolete">לא מצליח לכתוב לקובץ %s!</translation>
-    </message>
-    <message>
-        <source>Renaming it to ccpmp.old...</source>
-        <translation type="obsolete">משנה שם ל- ccpmp.old...</translation>
-    </message>
-    <message>
-        <source>Making place for ccpmp.bin...</source>
-        <translation type="obsolete">מכין מקום ל- ccpmp.bin...</translation>
-    </message>
-    <message>
-        <source>Adding header to %s...</source>
-        <translation type="obsolete">מוסיף כותרת ל- %s...</translation>
-    </message>
-    <message>
-        <source>Can&apos;t obtain current time!</source>
-        <translation type="obsolete">לא מצליח להשיג זמן נוכחי!</translation>
-    </message>
-    <message>
-        <source>Computing checksum...</source>
-        <translation type="obsolete">מחשב checksum...</translation>
-    </message>
-    <message>
-        <source>Updating main header...</source>
-        <translation type="obsolete">מעדכן את הכותרת הראשית...</translation>
-    </message>
-    <message>
-        <source>Writing output to %s...</source>
-        <translation type="obsolete">כותב פלט אל %s...</translation>
-    </message>
-</context>
-<context>
     <name>BootloaderInstallAms</name>
     <message>
         <location filename="../base/bootloaderinstallams.cpp" line="33"/>
@@ -616,68 +541,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished">מוריד את קובץ מנהל האיתחול</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">הצלחה: קובץ קושחה מוסגל נוצר</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished">כדי להסיר את ההתקנה, בצע שדרוג רגיל עם קובץ קושחה מקורי שלא נעשה בו שינוי</translation>
     </message>
@@ -1807,51 +1732,6 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>אורח</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>מנהל</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>משתמש</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>שגיאה</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(אין תיאור זמין)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>זוהתה בעיה:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1917,10 +1797,6 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>הורדת מידע הגירסאות הסתיימה.</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">שגיאת רשת: %1. אנא בדוק את הגדרות הרשת והפרוקסי שלך.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="377"/>
         <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>
@@ -2149,10 +2025,6 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>שגיאת רשת</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">לא מצליח לקבל מידע גירסה.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="563"/>
         <source>Really continue?</source>
         <translation>באמת להמשיך?</translation>
@@ -2220,10 +2092,6 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>צעדים ידניים נדרשים</translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">אין שיטת הסרת התקנה ידועה.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="421"/>
         <source>Do you really want to perform a complete installation?
 
@@ -2800,6 +2668,35 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">אורח</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">מנהל</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">משתמש</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">שגיאה</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(אין תיאור זמין)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3314,6 +3211,28 @@ HTTP response code: %1</translation>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;הרשאות אינן מספיקות להתקנת מנהל איתחול.
+הרשאות מנהל הינן הכרחיות&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;זוהה סוג נגן שגוי.
+נגן קיים: %1, הנגן שנבחר: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">זוהתה בעיה:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_it.ts b/rbutil/rbutilqt/lang/rbutil_it.ts
index 8d1e0cb..2c601ea 100644
--- a/rbutil/rbutilqt/lang/rbutil_it.ts
+++ b/rbutil/rbutilqt/lang/rbutil_it.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Firmware modificato creato con successo</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1719,50 +1719,6 @@ Select your device and Mountpoint manually.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Ospite</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Amministratore</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Utente</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(nessuna descrizione disponibile)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
-Administrator priviledges are necessary.&lt;/li&gt;</source>
-        <translation>&lt;li&gt;Permessi insufficenti per installare il bootloader.
-Sono necessari i privilegi di amministratore.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="196"/>
-        <source>&lt;li&gt;Target mismatch detected.
-Installed target: %1, selected target: %2.&lt;/li&gt;</source>
-        <translation>&lt;li&gt;Target non corrispondente. target installato: %1, selected target: %2.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>Problema individuato:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1788,10 +1744,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>Errore Rete</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Impossibile ottenere informazioni riguardo la versione.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="329"/>
         <source>New installation</source>
         <translation>Nuova installazione</translation>
@@ -1813,10 +1765,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>La tua configurazione non è valida. Questo spesso è causato da un cambiamento nel percorso del dispositivo. Si aprirà una finestra che permetterà di correggere il problema.</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Errore di rete: %1. Per favore controlla le tue impostazioni di rete e proxy.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="85"/>
         <source>Wine detected!</source>
         <translation type="unfinished"></translation>
@@ -2101,10 +2049,6 @@ Premi &quot;No&quot; per saltare questo passo.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Nessun metodo di disinstallazione conosciuto.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="1072"/>
         <source>Confirm download</source>
         <translation>Conferma download</translation>
@@ -2708,6 +2652,35 @@ Premi &quot;No&quot; per saltare questo passo.</translation>
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Ospite</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Amministratore</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Utente</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Errore</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(nessuna descrizione disponibile)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3215,6 +3188,27 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Permessi insufficenti per installare il bootloader.
+Sono necessari i privilegi di amministratore.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Target non corrispondente. target installato: %1, selected target: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Problema individuato:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_ja.ts b/rbutil/rbutilqt/lang/rbutil_ja.ts
index 08e584a..112483e 100644
--- a/rbutil/rbutilqt/lang/rbutil_ja.ts
+++ b/rbutil/rbutilqt/lang/rbutil_ja.ts
@@ -541,68 +541,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished">ブートローダをダウンロードしています</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">成功: 変更されたファームウェアが作成されました</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished">アンインストールは、改変されていないオリジナルのファームウェアを用いて通常の方法でファームウェアの更新を行って下さい</translation>
     </message>
@@ -1732,51 +1732,6 @@ TTSエンジンの設定を行って下さい。</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>ゲスト</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>管理者</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>ユーザ</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>エラー</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(利用可能な記述がありません)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>問題が見つかりました:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1786,10 +1741,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
 <context>
     <name>RbUtilQt</name>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">ネットワークエラー: %1. ネットワークおよびプロキシーの設定を確認して下さい。</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="377"/>
         <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>
@@ -2064,10 +2015,6 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>バージョン情報を取得することができませんでした!</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">バージョン情報が取得できません。</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="259"/>
         <source>Download build information finished.</source>
         <translation>ビルド情報のダウンロードが完了しました。</translation>
@@ -2140,10 +2087,6 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>手動で行う必要があります</translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">アンインストール方法が不明です。</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="421"/>
         <source>Do you really want to perform a complete installation?
 
@@ -2725,6 +2668,35 @@ Rockbox %1 をインストールします。 最新の開発版をインスト�
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">ゲスト</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">管理者</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">ユーザ</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">エラー</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(利用可能な記述がありません)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3234,6 +3206,28 @@ HTTP レスポンスコード: %1</translation>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;ブートローダをインストールするのに、アクセス権限が足りません。
+管理者権限が必要です。&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;検出されたターゲットが一致しません。
+インストールされているターゲット: %1, 選択されたターゲット: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">問題が見つかりました:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_nl.ts b/rbutil/rbutilqt/lang/rbutil_nl.ts
index 60f24c6..cbe03a7 100644
--- a/rbutil/rbutilqt/lang/rbutil_nl.ts
+++ b/rbutil/rbutilqt/lang/rbutil_nl.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished">Bezig met downloaden van Bootloader</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Succes: gemodificeerde Firmware aangemaakt</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1729,51 +1729,6 @@ Pas op: u moet eerst deze installatie doen met een internet verbinding om ze lat
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Gast</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Hoofdgebruiker</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Gebruiker</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>Fout</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(geen beschrijving beschikbaar)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <source>&lt;li&gt;Target mismatch detected.
-Installed target: %1, selected target: %2.&lt;/li&gt;</source>
-        <translation>&lt;li&gt;Verkeerd apparaat gevonden.
-Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>Probleem gevonden:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1810,10 +1765,6 @@ Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Netwerk fout:%1. Gelieve uw netwerk en proxy instelling te controleren.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="377"/>
         <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>
@@ -2080,10 +2031,6 @@ Network error: %1. Please check your network and proxy settings.</source>
         <translation>Netwerk fout</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Kan geen versie informatie ophalen.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="563"/>
         <source>Really continue?</source>
         <translation>Wilt u zeker verdergaan?</translation>
@@ -2151,10 +2098,6 @@ Kies &quot;Nee&quot; om deze stap over te slaan.</translation>
         <translation>Handmatige stappen zijn genoodzaakt</translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Geen deïnstallatie methode bekend.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="421"/>
         <source>Do you really want to perform a complete installation?
 
@@ -2720,6 +2663,35 @@ Dit zal Rockbox %1 installeren. Om de meest recente ontwikkelaars build te insta
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Gast</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Hoofdgebruiker</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Gebruiker</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Fout</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(geen beschrijving beschikbaar)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3229,6 +3201,28 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&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/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Verkeerd apparaat gevonden.
+Geïnstalleerd apparaat: %1, geselecteerd apparaat: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Probleem gevonden:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_pl.ts b/rbutil/rbutilqt/lang/rbutil_pl.ts
index 374dd57..a81566f 100644
--- a/rbutil/rbutilqt/lang/rbutil_pl.ts
+++ b/rbutil/rbutilqt/lang/rbutil_pl.ts
@@ -541,68 +541,68 @@ Zobacz http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1729,51 +1729,6 @@ Prosze skonfigurować silnik TTS.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Gość</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Administrator</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Użytkownik</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>Błąd</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(opis niedostępny)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
-Administrator priviledges are necessary.&lt;/li&gt;</source>
-        <translation>&lt;li&gt;Nie posiadasz odpowiednich praw do instalacji bootloadera.
-Wymagane są prawa administratora.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="196"/>
-        <source>&lt;li&gt;Target mismatch detected.
-Installed target: %1, selected target: %2.&lt;/li&gt;</source>
-        <translation type="unfinished">&lt;li&gt;Odtwarzacz nie pasuje do wersji Rockboxa.
-Zainstalowana wersja:%1, wybrana wersja: %2.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>Wykryto problem:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1811,10 +1766,6 @@ Zainstalowana wersja:%1, wybrana wersja: %2.&lt;/li&gt;</translation>
         <translation>Błąd połączenia</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Nie można wykryć informacji o wersji.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="329"/>
         <source>New installation</source>
         <translation>Nowa instalacja</translation>
@@ -1841,10 +1792,6 @@ Zainstalowana wersja:%1, wybrana wersja: %2.&lt;/li&gt;</translation>
         <translation>Skończono pobieranie informacji.</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Błąd połączenia sieciowego: %1. Sprawdź sieć i ustawienia proxy.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="85"/>
         <source>Wine detected!</source>
         <translation type="unfinished"></translation>
@@ -2114,10 +2061,6 @@ Naciśnij &quot;Nie&quot; aby pominąć ten etap.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Nieznana metoda dezinstalacji.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="1072"/>
         <source>Confirm download</source>
         <translation>Potwierdź pobieranie</translation>
@@ -2721,6 +2664,35 @@ Naciśnij &quot;Nie&quot; aby pominąć ten etap.</translation>
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Gość</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Administrator</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Użytkownik</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Błąd</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(opis niedostępny)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3231,6 +3203,28 @@ Odpowiedź z serwera HTTP: %1</translation>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Nie posiadasz odpowiednich praw do instalacji bootloadera.
+Wymagane są prawa administratora.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Odtwarzacz nie pasuje do wersji Rockboxa.
+Zainstalowana wersja:%1, wybrana wersja: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Wykryto problem:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_pt.ts b/rbutil/rbutilqt/lang/rbutil_pt.ts
index 1390b5f..f31a030 100644
--- a/rbutil/rbutilqt/lang/rbutil_pt.ts
+++ b/rbutil/rbutilqt/lang/rbutil_pt.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished">Transferindo rotina de arranque</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished">Sucesso: ficheiro de firmware modificado criado</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1722,50 +1722,6 @@ Seleccione um dispositivo e um ponto de montagem manualmente.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation>Convidado</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation>Administrador</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation>Utilizador</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation>(sem descrição disponível)</translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation>Problema detectado:</translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1791,10 +1747,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>Erro de rede</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Não consegue obter informação da versão.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="329"/>
         <source>New installation</source>
         <translation>Nova instalação</translation>
@@ -1816,10 +1768,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</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>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Erro de rede:%1. Por favor, verifique as suas definições de rede e do proxy.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="205"/>
         <location filename="../rbutilqt.cpp" line="238"/>
         <source>Downloading build information, please wait ...</source>
@@ -2085,10 +2033,6 @@ Pressione &quot;No&quot; para passar este passo.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Nenhum método de desinstalação conhecido.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="1072"/>
         <source>Confirm download</source>
         <translation>Confirmar transferência</translation>
@@ -2713,6 +2657,35 @@ se instalou o ficheiro de voz, o Rockbox irá falar.</translation>
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished">Convidado</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished">Administrador</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished">Utilizador</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Erro</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished">(sem descrição disponível)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3222,6 +3195,27 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&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/utils.cpp" line="196"/>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Detectado diferença de alvos.Alvo instalado: %1, alvo seleccionado: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <location filename="../base/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Problema detectado:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_pt_BR.ts b/rbutil/rbutilqt/lang/rbutil_pt_BR.ts
index 05e89b8..3436e23 100644
--- a/rbutil/rbutilqt/lang/rbutil_pt_BR.ts
+++ b/rbutil/rbutilqt/lang/rbutil_pt_BR.ts
@@ -2,81 +2,6 @@
 <!DOCTYPE TS>
 <TS version="2.0">
 <context>
-    <name>@default</name>
-    <message>
-        <source>Can&apos;t open file %s!</source>
-        <translation type="obsolete">Não é possível abrir o arquivo %s!</translation>
-    </message>
-    <message>
-        <source>Bootloader size is %d bytes</source>
-        <translation type="obsolete">O tamanho do inicializador é %d bytes</translation>
-    </message>
-    <message>
-        <source>Firmware size is %d bytes</source>
-        <translation type="obsolete">O tamanho do firmware é %d bytes</translation>
-    </message>
-    <message>
-        <source>Can&apos;t allocate %d bytes!</source>
-        <translation type="obsolete">Não é possível alocar %d bytes!</translation>
-    </message>
-    <message>
-        <source>Reading %s into memory...</source>
-        <translation type="obsolete">Lendo %s na memória...</translation>
-    </message>
-    <message>
-        <source>Can&apos;t read file %s to memory!</source>
-        <translation type="obsolete">Não é possível ler o arquivo %s para a memória!</translation>
-    </message>
-    <message>
-        <source>File %s isn&apos;t a valid ChinaChip firmware!</source>
-        <translation type="obsolete">O arquivo %s não é um firmware ChinaChip válido!</translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t find ccpmp.bin in %s!</source>
-        <translation type="obsolete">Não foi possível encontrar ccpmp.bin em %s!</translation>
-    </message>
-    <message>
-        <source>Found ccpmp.bin at %d bytes</source>
-        <translation type="obsolete">Encontrando ccpmp.bin no %d bytes</translation>
-    </message>
-    <message>
-        <source>Writing %d bytes to %s...</source>
-        <translation type="obsolete">Escrevendo %d bytes para %s...</translation>
-    </message>
-    <message>
-        <source>Can&apos;t write to file %s!</source>
-        <translation type="obsolete">Não é possível escrever no arquivo %s!</translation>
-    </message>
-    <message>
-        <source>Renaming it to ccpmp.old...</source>
-        <translation type="obsolete">Renomeando-o para ccpmp.old...</translation>
-    </message>
-    <message>
-        <source>Making place for ccpmp.bin...</source>
-        <translation type="obsolete">Dando lugar a ccpmp.bin...</translation>
-    </message>
-    <message>
-        <source>Adding header to %s...</source>
-        <translation type="obsolete">Adicionando cabeçalho para %s...</translation>
-    </message>
-    <message>
-        <source>Can&apos;t obtain current time!</source>
-        <translation type="obsolete">Não foi possível obter a hora atual!</translation>
-    </message>
-    <message>
-        <source>Computing checksum...</source>
-        <translation type="obsolete">Calculando checksum...</translation>
-    </message>
-    <message>
-        <source>Updating main header...</source>
-        <translation type="obsolete">Atualizando cabeçalho principal...</translation>
-    </message>
-    <message>
-        <source>Writing output to %s...</source>
-        <translation type="obsolete">Escrevendo saída para %s...</translation>
-    </message>
-</context>
-<context>
     <name>BootloaderInstallAms</name>
     <message>
         <source>Downloading bootloader file</source>
@@ -518,10 +443,6 @@ Veja http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -538,28 +459,32 @@ Veja http://www.rockbox.org/wiki/IpodConversionToFAT32</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not open outputfile.</source>
+        <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not write outputfile.</source>
-        <translation type="unfinished"></translation>
+        <source>Success: modified firmware file created</source>
+        <translation type="unfinished">Sucesso: criado arquivo de firmware modificado</translation>
     </message>
     <message>
-        <source>Unknown errornumber: %1</source>
+        <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
+        <translation type="unfinished">Para desinstalar, faça uma atualização normal com um firmware original não modificado</translation>
+    </message>
+    <message>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Patching original firmware failed: %1</source>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Success: modified firmware file created</source>
-        <translation type="unfinished">Sucesso: criado arquivo de firmware modificado</translation>
+        <source>Could not write output file.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
-        <translation type="unfinished">Para desinstalar, faça uma atualização normal com um firmware original não modificado</translation>
+        <source>Unknown error number: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1467,42 +1392,6 @@ O Utilitário Rockbox não funciona com estas configurações de proxy. Certifiq
 <context>
     <name>QObject</name>
     <message>
-        <source>Guest</source>
-        <translation>Convidado</translation>
-    </message>
-    <message>
-        <source>Admin</source>
-        <translation>Administrador</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation>Usuário</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <source>(no description available)</source>
-        <translation>(nenhuma descrição disponível)</translation>
-    </message>
-    <message>
-        <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 do carregador.
-É necessário privilégios de administrator.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;li&gt;Target mismatch detected.
-Installed target: %1, selected target: %2.&lt;/li&gt;</source>
-        <translation>&lt;li&gt;Detectada diferenças de alvos.
-Alvo instalado: %1, alvo selecionado: %2.&lt;/li&gt;</translation>
-    </message>
-    <message>
-        <source>Problem detected:</source>
-        <translation>Problema detectado:</translation>
-    </message>
-    <message>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
         <translation type="unfinished"></translation>
@@ -1523,10 +1412,6 @@ Alvo instalado: %1, alvo selecionado: %2.&lt;/li&gt;</translation>
         <translation>Erro de rede</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Não é possível obter informação da versão.</translation>
-    </message>
-    <message>
         <source>New installation</source>
         <translation>Nova instalação</translation>
     </message>
@@ -1543,10 +1428,6 @@ Alvo instalado: %1, alvo selecionado: %2.&lt;/li&gt;</translation>
         <translation>Sua configuração é inválida. Isto é geralmente causado por uma mudança no caminho do dispositivo. A janela de configuração abrirá agora para permitir que você corrija o problema.</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Erro de rede: %1. Por favor, verifique suas configurações de rede e proxy.</translation>
-    </message>
-    <message>
         <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>
@@ -1717,10 +1598,6 @@ Pressione &quot;Não&quot; para pular esse passo.</translation>
         <translation>Você realmente quer desinstalar o Inicializador?</translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Nenhum método de desinstalação conhecido.</translation>
-    </message>
-    <message>
         <source>Confirm download</source>
         <translation>Confirmar transferência</translation>
     </message>
@@ -2256,6 +2133,29 @@ se você instalar o arquivo de voz, o Rockbox falará.</translation>
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <source>Guest</source>
+        <translation type="unfinished">Convidado</translation>
+    </message>
+    <message>
+        <source>Admin</source>
+        <translation type="unfinished">Administrador</translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished">Usuário</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Erro</translation>
+    </message>
+    <message>
+        <source>(no description available)</source>
+        <translation type="unfinished">(nenhuma descrição disponível)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <source>Voice:</source>
@@ -2670,6 +2570,25 @@ código de resposta HTTP: %1</translation>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Permissões insuficientes para a instalação do carregador.
+É necessário privilégios de administrator.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Detectada diferenças de alvos.
+Alvo instalado: %1, alvo selecionado: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Problema detectado:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <source>Starting Voicefile generation</source>
diff --git a/rbutil/rbutilqt/lang/rbutil_ru.ts b/rbutil/rbutilqt/lang/rbutil_ru.ts
index cc10c6f..6f93d67 100644
--- a/rbutil/rbutilqt/lang/rbutil_ru.ts
+++ b/rbutil/rbutilqt/lang/rbutil_ru.ts
@@ -443,10 +443,6 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -463,27 +459,31 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not open outputfile.</source>
+        <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not write outputfile.</source>
+        <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown errornumber: %1</source>
+        <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Patching original firmware failed: %1</source>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Success: modified firmware file created</source>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
+        <source>Could not write output file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1388,42 +1388,6 @@ Rockbox Utility can&apos;t work with this proxy settings. Make sure the system p
 <context>
     <name>QObject</name>
     <message>
-        <source>Guest</source>
-        <translation>Гость</translation>
-    </message>
-    <message>
-        <source>Admin</source>
-        <translation>Администратор</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation>Пользователь</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <source>(no description available)</source>
-        <translation>(описание недоступно)</translation>
-    </message>
-    <message>
-        <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>
-        <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>
-        <source>Problem detected:</source>
-        <translation>Обнаружена проблема:</translation>
-    </message>
-    <message>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
         <translation type="unfinished"></translation>
@@ -1440,10 +1404,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>Версия</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Ошибка сети: %1. Проверьте ваши настройки сети и прокси.</translation>
-    </message>
-    <message>
         <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>
@@ -1592,10 +1552,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>Ошибка сети</translation>
     </message>
     <message>
-        <source>Can&apos;t get version information.</source>
-        <translation type="obsolete">Не могу получить информацию о версии.</translation>
-    </message>
-    <message>
         <source>Really continue?</source>
         <translation>Продожить?</translation>
     </message>
@@ -1650,10 +1606,6 @@ Press &quot;No&quot; to skip this step.</source>
         <translation>Требуются действия вручную</translation>
     </message>
     <message>
-        <source>No uninstall method known.</source>
-        <translation type="obsolete">Нет известного способа удаления.</translation>
-    </message>
-    <message>
         <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>
@@ -2175,6 +2127,29 @@ Network error: %1. Please check your network and proxy settings.</source>
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <source>Guest</source>
+        <translation type="unfinished">Гость</translation>
+    </message>
+    <message>
+        <source>Admin</source>
+        <translation type="unfinished">Администратор</translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished">Пользователь</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
+    <message>
+        <source>(no description available)</source>
+        <translation type="unfinished">(описание недоступно)</translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <source>Voice:</source>
@@ -2590,6 +2565,25 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <source>&lt;li&gt;Permissions insufficient for bootloader installation.
+Administrator priviledges are necessary.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Недостаточные полномочия для установки загрузчика.
+Нужны полномочия администратора.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;li&gt;Target mismatch detected.
+Installed target: %1, selected target: %2.&lt;/li&gt;</source>
+        <translation type="unfinished">&lt;li&gt;Цели не соответствуют.
+Установленная цель: %1, Выбранная цель: %2.&lt;/li&gt;</translation>
+    </message>
+    <message>
+        <source>Problem detected:</source>
+        <translation type="unfinished">Обнаружена проблема:</translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <source>Starting Voicefile generation</source>
diff --git a/rbutil/rbutilqt/lang/rbutil_tr.ts b/rbutil/rbutilqt/lang/rbutil_tr.ts
index 53d1aca..5650fec 100644
--- a/rbutil/rbutilqt/lang/rbutil_tr.ts
+++ b/rbutil/rbutilqt/lang/rbutil_tr.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1717,49 +1717,6 @@ Please configure TTS engine.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation type="unfinished">Hata</translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1785,10 +1742,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation>Yapilandirma hatasi</translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">Ag hatasi: %1. L�tfen ag ve vekil sunucu ayarlarinizi kontrol ediniz.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="205"/>
         <location filename="../rbutilqt.cpp" line="238"/>
         <source>Downloading build information, please wait ...</source>
@@ -2694,6 +2647,35 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished">Hata</translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3202,6 +3184,26 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <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/utils.cpp" line="196"/>
+        <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/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts b/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
index 52fad3f..f153582 100644
--- a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
+++ b/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1715,49 +1715,6 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1794,10 +1751,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">网络错误： %1. 请检查你的网络和代理服务的设置.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="377"/>
         <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>
@@ -2692,6 +2645,35 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3199,6 +3181,26 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <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/utils.cpp" line="196"/>
+        <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/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>
diff --git a/rbutil/rbutilqt/lang/rbutil_zh_TW.ts b/rbutil/rbutilqt/lang/rbutil_zh_TW.ts
index d83e3a6..6fc991f 100644
--- a/rbutil/rbutilqt/lang/rbutil_zh_TW.ts
+++ b/rbutil/rbutilqt/lang/rbutil_zh_TW.ts
@@ -540,68 +540,68 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="79"/>
         <source>Could not open the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="81"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="82"/>
         <source>Could not read the original firmware.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="84"/>
-        <source>Loaded firmware file does not look like MPIO OF file.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="85"/>
+        <source>Loaded firmware file does not look like MPIO original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="87"/>
-        <source>Could not open downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="100"/>
+        <source>Could not open output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="90"/>
-        <source>Place for bootloader in OF file not empty.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="103"/>
+        <source>Could not write output file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="93"/>
-        <source>Could not read the downloaded bootloader.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="106"/>
+        <source>Unknown error number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="96"/>
-        <source>Bootloader checksum error.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="88"/>
+        <source>Could not open downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="99"/>
-        <source>Could not open outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="91"/>
+        <source>Place for bootloader in OF file not empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="102"/>
-        <source>Could not write outputfile.</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="94"/>
+        <source>Could not read the downloaded bootloader.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="105"/>
-        <source>Unknown errornumber: %1</source>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="97"/>
+        <source>Bootloader checksum error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="109"/>
         <location filename="../base/bootloaderinstallmpio.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="111"/>
         <source>Patching original firmware failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="118"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmpio.cpp" line="125"/>
+        <location filename="../base/bootloaderinstallmpio.cpp" line="126"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1715,49 +1715,6 @@ You need to change your player to UMS mode for installation. </source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../base/system.cpp" line="119"/>
-        <source>Guest</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="122"/>
-        <source>Admin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="125"/>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="128"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/system.cpp" line="257"/>
-        <location filename="../base/system.cpp" line="302"/>
-        <source>(no description available)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/utils.cpp" line="184"/>
-        <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/utils.cpp" line="196"/>
-        <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/utils.cpp" line="203"/>
-        <source>Problem detected:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../main.cpp" line="71"/>
         <source>LTR</source>
         <extracomment>This string is used to indicate the writing direction. Translate it to &quot;RTL&quot; (without quotes) for RTL languages. Anything else will get treated as LTR language.</extracomment>
@@ -1794,10 +1751,6 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Network error: %1. Please check your network and proxy settings.</source>
-        <translation type="obsolete">网絡錯誤： %1. 請檢查你的网絡和代理服務的設置.</translation>
-    </message>
-    <message>
         <location filename="../rbutilqt.cpp" line="377"/>
         <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>
@@ -2692,6 +2645,35 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
 </context>
 <context>
+    <name>System</name>
+    <message>
+        <location filename="../base/system.cpp" line="119"/>
+        <source>Guest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="122"/>
+        <source>Admin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="125"/>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="128"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/system.cpp" line="257"/>
+        <location filename="../base/system.cpp" line="302"/>
+        <source>(no description available)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TTSCarbon</name>
     <message>
         <location filename="../base/ttscarbon.cpp" line="133"/>
@@ -3199,6 +3181,26 @@ HTTP response code: %1</source>
     </message>
 </context>
 <context>
+    <name>Utils</name>
+    <message>
+        <location filename="../base/utils.cpp" line="184"/>
+        <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/utils.cpp" line="196"/>
+        <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/utils.cpp" line="203"/>
+        <source>Problem detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>VoiceFileCreator</name>
     <message>
         <location filename="../base/voicefile.cpp" line="41"/>