1 files changed, 833 insertions, 637 deletions

diff --git a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts b/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
index 7e217031ec..5d004848a5 100644
--- a/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
+++ b/rbutil/rbutilqt/lang/rbutil_zh_CN.ts
@@ -4,48 +4,48 @@
 <context>
     <name>BootloaderInstallAms</name>
     <message>
-        <location filename="../base/bootloaderinstallams.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 browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&apos;&lt;/a&gt; or 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/SansaAMS&apos;&gt;SansaAMS&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>
+        <location filename="../base/bootloaderinstallams.cpp" line="32"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (bin file). This firmware file will be patched and then installed to your player along with the rockbox bootloader. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&apos;&lt;/a&gt; or 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/SansaAMS&apos;&gt;SansaAMS&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallams.cpp" line="54"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="55"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallams.cpp" line="96"/>
-        <location filename="../base/bootloaderinstallams.cpp" line="109"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="97"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="110"/>
         <source>Could not load %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallams.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="124"/>
         <source>No room to insert bootloader, try another firmware version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallams.cpp" line="133"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="134"/>
         <source>Patching Firmware...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallams.cpp" line="144"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="145"/>
         <source>Could not open %1 for writing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallams.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="158"/>
         <source>Could not write firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallams.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="174"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallams.cpp" line="181"/>
+        <location filename="../base/bootloaderinstallams.cpp" line="182"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53,97 +53,127 @@
 <context>
     <name>BootloaderInstallBase</name>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="120"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="124"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">下载错误: 接到 HTTP 错误 %1. </translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="126"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="130"/>
         <source>Download error: %1</source>
         <translation type="unfinished">下载错误: %1</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="132"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="136"/>
         <source>Download finished (cache used).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="134"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="138"/>
         <source>Download finished.</source>
         <translation type="unfinished">完成下载.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="155"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="159"/>
         <source>Creating backup of original firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="157"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="161"/>
         <source>Creating backup folder failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="163"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="167"/>
         <source>Creating backup copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="166"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="170"/>
         <source>Backup created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="183"/>
         <source>Creating installation log</source>
         <translation type="unfinished">正在建立安装日志</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="203"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="207"/>
         <source>Bootloader installation is almost complete. Installation &lt;b&gt;requires&lt;/b&gt; you to perform the following steps manually:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="208"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="213"/>
         <source>&lt;li&gt;Safely remove your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="212"/>
-        <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
+        <location filename="../base/bootloaderinstallbase.cpp" line="218"/>
+        <source>&lt;li&gt;Reboot your player into the original firmware.&lt;/li&gt;&lt;li&gt;Perform a firmware upgrade using the update functionality of the original firmware. Please refer to your player&apos;s manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before starting the firmware update process.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="221"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="229"/>
+        <source>&lt;li&gt;Remove any previously inserted microSD card&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="230"/>
+        <source>&lt;li&gt;Disconnect your player. The player will reboot and perform an update of the original firmware. Please refer to your players manual on details.&lt;br/&gt;&lt;b&gt;Important:&lt;/b&gt; updating the firmware is a critical process that must not be interrupted. &lt;b&gt;Make sure the player is charged before disconnecting the player.&lt;/b&gt;&lt;/li&gt;&lt;li&gt;After the firmware has been updated reboot your player.&lt;/li&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="329"/>
+        <source>Zip file format detected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="339"/>
+        <source>Extracting firmware %1 from archive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="346"/>
+        <source>Error extracting firmware from archive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="353"/>
+        <source>Could not find firmware in archive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallbase.cpp" line="241"/>
         <source>&lt;li&gt;Turn the player off&lt;/li&gt;&lt;li&gt;Insert the charger&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="226"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="246"/>
         <source>&lt;li&gt;Unplug USB and power adaptors&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to turn the player off&lt;/li&gt;&lt;li&gt;Toggle the battery switch on the player&lt;/li&gt;&lt;li&gt;Hold &lt;i&gt;Power&lt;/i&gt; to boot into Rockbox&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="232"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="252"/>
         <source>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can safely install other parts first, but the above steps are &lt;b&gt;required&lt;/b&gt; to finish the installation!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="246"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="266"/>
         <source>Waiting for system to remount player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="276"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="296"/>
         <source>Player remounted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="281"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="301"/>
         <source>Timeout on remount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallbase.cpp" line="191"/>
+        <location filename="../base/bootloaderinstallbase.cpp" line="195"/>
         <source>Installation log created</source>
         <translation type="unfinished"></translation>
     </message>
@@ -151,60 +181,125 @@
 <context>
     <name>BootloaderInstallChinaChip</name>
     <message>
-        <location filename="../base/bootloaderinstallchinachip.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="33"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (HXF 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/OndaVX747#Download_and_extract_a_recent_ve&apos;&gt;OndaVX747&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallchinachip.cpp" line="79"/>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="50"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="75"/>
+        <source>Could not open firmware file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="78"/>
+        <source>Could not open bootloader file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="81"/>
+        <source>Could not allocate memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="84"/>
+        <source>Could not load firmware file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="87"/>
+        <source>File is not a valid ChinaChip firmware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="90"/>
+        <source>Could not find ccpmp.bin in input file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="93"/>
+        <source>Could not open backup file for ccpmp.bin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="96"/>
+        <source>Could not write backup file for ccpmp.bin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="99"/>
+        <source>Could not load bootloader file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="102"/>
+        <source>Could not get current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="105"/>
+        <source>Could not open output file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="108"/>
+        <source>Could not write output file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallchinachip.cpp" line="111"/>
+        <source>Unexpected error from chinachippatcher</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BootloaderInstallFile</name>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="35"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="33"/>
         <source>Downloading bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="44"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="42"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="76"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="74"/>
         <source>Error accessing output folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="89"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="87"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="99"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="97"/>
         <source>Removing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="103"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="101"/>
         <source>No original firmware file found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="109"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="107"/>
         <source>Can&apos;t remove Rockbox bootloader file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="114"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="112"/>
         <source>Can&apos;t restore bootloader file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallfile.cpp" line="118"/>
+        <location filename="../base/bootloaderinstallfile.cpp" line="116"/>
         <source>Original bootloader restored successfully.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -212,274 +307,322 @@
 <context>
     <name>BootloaderInstallHex</name>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="68"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="67"/>
         <source>checking MD5 hash of input file ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="79"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="78"/>
         <source>Could not verify original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="94"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="93"/>
         <source>Firmware file not recognized.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="98"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="97"/>
         <source>MD5 hash ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="105"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="104"/>
         <source>Firmware file doesn&apos;t match selected player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="109"/>
         <source>Descrambling file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="118"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="117"/>
         <source>Error in descramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="123"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="122"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="133"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="132"/>
         <source>Adding bootloader to firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="170"/>
         <source>could not open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="171"/>
         <source>reading header failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="172"/>
         <source>reading firmware failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="173"/>
         <source>can&apos;t open bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="174"/>
         <source>reading bootloader file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="175"/>
         <source>can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="176"/>
         <source>writing output file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="179"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="178"/>
         <source>Error in patching: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="190"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="189"/>
         <source>Error in scramble: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="205"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="204"/>
         <source>Checking modified firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="207"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="206"/>
         <source>Error: modified file checksum wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="215"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="214"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="225"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="224"/>
         <source>Uninstallation not possible, only installation info removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="245"/>
         <source>Can&apos;t open input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="246"/>
         <source>Can&apos;t open output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="247"/>
         <source>invalid file: header length wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="248"/>
         <source>invalid file: unrecognized header</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="249"/>
         <source>invalid file: &quot;length&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="250"/>
         <source>invalid file: &quot;length2&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="251"/>
         <source>invalid file: internal checksum error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="252"/>
         <source>invalid file: &quot;length3&quot; field wrong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="254"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="253"/>
         <source>unknown</source>
         <translation type="unfinished">不明</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallhex.cpp" line="49"/>
+        <location filename="../base/bootloaderinstallhex.cpp" line="48"/>
         <source>Bootloader installation requires you to provide a firmware file of the original firmware (hex file). You need to download this file yourself due to legal reasons. Please refer to the &lt;a href=&apos;http://www.rockbox.org/manual.shtml&apos;&gt;manual&lt;/a&gt; and the &lt;a href=&apos;http://www.rockbox.org/wiki/IriverBoot#Download_and_extract_a_recent_ve&apos;&gt;IriverBoot&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>BootloaderInstallImx</name>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="69"/>
+        <source>Bootloader installation requires you to provide a copy of the original Sandisk firmware (firmware.sb file). This file will be patched with the Rockbox bootloader and installed to your player. You need to download this file yourself due to legal reasons. Please browse the &lt;a href=&apos;http://forums.sandisk.com/sansa/&apos;&gt;Sansa Forums&lt;/a&gt; or refer to the &lt;a href= &apos;http://www.rockbox.org/wiki/SansaFuzePlus&apos;&gt;SansaFuzePlus&lt;/a&gt; wiki page on how to obtain this file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="91"/>
+        <source>Could not read original firmware file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="97"/>
+        <source>Downloading bootloader file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="107"/>
+        <source>Patching file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="134"/>
+        <source>Patching the original firmware failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="140"/>
+        <source>Succesfully patched firmware file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="155"/>
+        <source>Bootloader successful installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="161"/>
+        <source>Patched bootloader could not be installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/bootloaderinstallimx.cpp" line="172"/>
+        <source>To uninstall, perform a normal upgrade with an unmodified original firmware.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>BootloaderInstallIpod</name>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="54"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="53"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="82"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="81"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="66"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="153"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="65"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="152"/>
         <source>Failed to read firmware directory</source>
         <translation type="unfinished">读不了固件文件夹</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="71"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="158"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="70"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="157"/>
         <source>Unknown version number in firmware (%1)</source>
         <translation type="unfinished">固件版本不明 (%1)</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="77"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="76"/>
         <source>Warning: This is a MacPod, Rockbox only runs on WinPods. 
 See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="96"/>
-        <location filename="../base/bootloaderinstallipod.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="95"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="164"/>
         <source>Could not open Ipod in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="106"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="105"/>
         <source>Successfull added bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="117"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="116"/>
         <source>Failed to add bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="129"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="128"/>
         <source>Bootloader Installation complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="134"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="133"/>
         <source>Writing log aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="171"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="170"/>
         <source>No bootloader detected.</source>
         <translation type="unfinished">找不到启动程序.</translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="177"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="176"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="184"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="183"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="231"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="230"/>
         <source>Error: could not retrieve device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="247"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="246"/>
         <source>Error: no mountpoint specified!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="252"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="251"/>
         <source>Could not open Ipod: permission denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="256"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="255"/>
         <source>Could not open Ipod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="267"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="266"/>
         <source>No firmware partition on disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="92"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="91"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="144"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="143"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallipod.cpp" line="261"/>
+        <location filename="../base/bootloaderinstallipod.cpp" line="260"/>
         <source>Error reading partition table - possibly not an Ipod</source>
         <translation type="unfinished"></translation>
     </message>
@@ -487,42 +630,42 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallMi4</name>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="34"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="33"/>
         <source>Downloading bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="43"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="42"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="66"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="65"/>
         <source>Bootloader successful installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="77"/>
         <source>Checking for Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="80"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="79"/>
         <source>No Rockbox bootloader found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="85"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="84"/>
         <source>Checking for original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="90"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="89"/>
         <source>Error finding original firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallmi4.cpp" line="100"/>
+        <location filename="../base/bootloaderinstallmi4.cpp" line="99"/>
         <source>Rockbox bootloader successful removed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -609,34 +752,34 @@ See http://www.rockbox.org/wiki/IpodConversionToFAT32</source>
 <context>
     <name>BootloaderInstallSansa</name>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="56"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="55"/>
         <source>Error: can&apos;t allocate buffer memory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="61"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="60"/>
         <source>Searching for Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="67"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="66"/>
         <source>Permission for disc access denied!
 This is required to install the bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="74"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="73"/>
         <source>No Sansa detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="87"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="86"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="79"/>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="187"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="78"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="188"/>
         <source>OLD ROCKBOX INSTALLATION DETECTED, ABORTING.
 You must reinstall the original Sansa firmware before running
 sansapatcher for the first time.
@@ -645,83 +788,83 @@ See http://www.rockbox.org/wiki/SansaE200Install
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="109"/>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="197"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="110"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="198"/>
         <source>Could not open Sansa in R/W mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="136"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="137"/>
         <source>Successfully installed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="147"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="148"/>
         <source>Failed to install bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="160"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="161"/>
         <source>Bootloader Installation complete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="165"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="166"/>
         <source>Writing log aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="247"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="248"/>
         <source>Error: could not retrieve device name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="263"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="264"/>
         <source>Can&apos;t find Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="268"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="269"/>
         <source>Could not open Sansa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="273"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="274"/>
         <source>Could not read partition table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="280"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="281"/>
         <source>Disk is not a Sansa (Error %1), aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="203"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="204"/>
         <source>Successfully removed bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="210"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="211"/>
         <source>Removing bootloader failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="101"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="102"/>
         <source>Installing Rockbox bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="118"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="119"/>
         <source>Checking downloaded bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="126"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="127"/>
         <source>Bootloader mismatch! Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstallsansa.cpp" line="178"/>
+        <location filename="../base/bootloaderinstallsansa.cpp" line="179"/>
         <source>Uninstalling bootloader</source>
         <translation type="unfinished"></translation>
     </message>
@@ -729,301 +872,263 @@ See http://www.rockbox.org/wiki/SansaE200Install
 <context>
     <name>BootloaderInstallTcc</name>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="34"/>
+        <location filename="../base/bootloaderinstalltcc.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/CowonD2Info&apos;&gt;CowonD2Info&lt;/a&gt; wiki page on how to obtain the file.&lt;br/&gt;Press Ok to continue and browse your computer for the firmware file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="51"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="50"/>
         <source>Downloading bootloader file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="83"/>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="100"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="82"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="99"/>
         <source>Could not load %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="91"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="90"/>
         <source>Unknown OF file used: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="105"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="104"/>
         <source>Patching Firmware...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="112"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="111"/>
         <source>Could not patch firmware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="118"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="117"/>
         <source>Could not open %1 for writing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="127"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="126"/>
         <source>Could not write firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="132"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="131"/>
         <source>Success: modified firmware file created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/bootloaderinstalltcc.cpp" line="152"/>
+        <location filename="../base/bootloaderinstalltcc.cpp" line="151"/>
         <source>To uninstall, perform a normal upgrade with an unmodified original firmware</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>BrowseDirtreeFrm</name>
-    <message>
-        <location filename="../browsedirtreefrm.ui" line="13"/>
-        <source>Find Directory</source>
-        <translation>寻找文件夹</translation>
-    </message>
-    <message>
-        <location filename="../browsedirtreefrm.ui" line="19"/>
-        <source>Browse to the destination folder</source>
-        <translation>浏览目的地文件夹</translation>
-    </message>
-    <message>
-        <location filename="../browsedirtreefrm.ui" line="47"/>
-        <source>&amp;Ok</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../browsedirtreefrm.ui" line="57"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;取消</translation>
-    </message>
-</context>
-<context>
     <name>Config</name>
     <message>
-        <location filename="../configure.cpp" line="136"/>
-        <source>Language changed</source>
-        <translation>语言已改变</translation>
-    </message>
-    <message>
-        <location filename="../configure.cpp" line="137"/>
-        <source>You need to restart the application for the changed language to take effect.</source>
-        <translation>你需要重新开启本软件才能使用新语言.</translation>
-    </message>
-    <message>
-        <location filename="../configure.cpp" line="292"/>
+        <location filename="../configure.cpp" line="310"/>
         <source>Showing disabled targets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="293"/>
+        <location filename="../configure.cpp" line="311"/>
         <source>You just enabled showing targets that are marked disabled. Disabled targets are not recommended to end users. Please use this option only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="475"/>
+        <location filename="../configure.cpp" line="493"/>
         <source>Proxy Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="476"/>
+        <location filename="../configure.cpp" line="494"/>
         <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>
     </message>
     <message>
-        <location filename="../configure.cpp" line="577"/>
+        <location filename="../configure.cpp" line="607"/>
         <source>Set Cache Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="645"/>
+        <location filename="../configure.cpp" line="736"/>
         <source>%1 &quot;MacPod&quot; found!
 Rockbox needs a FAT formatted Ipod (so-called &quot;WinPod&quot;) to run. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="652"/>
+        <location filename="../configure.cpp" line="743"/>
         <source>%1 in MTP mode found!
 You need to change your player to MSC mode for installation. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="657"/>
+        <location filename="../configure.cpp" line="748"/>
         <source>Until you change this installation will fail!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="664"/>
+        <location filename="../configure.cpp" line="755"/>
         <source>Detected an unsupported player:
 %1
 Sorry, Rockbox doesn&apos;t run on your player.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="669"/>
+        <location filename="../configure.cpp" line="760"/>
         <source>Fatal: player incompatible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="680"/>
-        <location filename="../configure.cpp" line="689"/>
+        <location filename="../configure.cpp" line="771"/>
+        <location filename="../configure.cpp" line="780"/>
         <source>Autodetection</source>
         <translation>自动识别</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="681"/>
+        <location filename="../configure.cpp" line="772"/>
         <source>Could not detect a Mountpoint.
 Select your Mountpoint manually.</source>
         <translation>找不到 mountpoint
 请手动选择你的 mountpoing.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="690"/>
+        <location filename="../configure.cpp" line="781"/>
         <source>Could not detect a device.
 Select your device and Mountpoint manually.</source>
         <translation>不能识别你的播放器
 请手动选择.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="701"/>
+        <location filename="../configure.cpp" line="792"/>
         <source>Really delete cache?</source>
         <translation>你肯定要删除缓冲吗?</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="702"/>
+        <location filename="../configure.cpp" line="793"/>
         <source>Do you really want to delete the cache? Make absolutely sure this setting is correct as it will remove &lt;b&gt;all&lt;/b&gt; files in this folder!</source>
         <translation>你真的肯定要删除缓冲吗? 请确认你的设定是正确的因为这会删除 &lt;b&gt;全部&lt;/b&gt; 的文件在此文件夹 !</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="710"/>
+        <location filename="../configure.cpp" line="801"/>
         <source>Path wrong!</source>
         <translation>路径错误!</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="711"/>
+        <location filename="../configure.cpp" line="802"/>
         <source>The cache path is invalid. Aborting.</source>
         <translation>缓冲路径错误. 正在取消.</translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="749"/>
+        <location filename="../configure.cpp" line="840"/>
         <source>TTS configuration invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="750"/>
+        <location filename="../configure.cpp" line="841"/>
         <source>TTS configuration invalid. 
  Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="755"/>
+        <location filename="../configure.cpp" line="846"/>
         <source>Could not start TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="756"/>
+        <location filename="../configure.cpp" line="847"/>
         <source>Could not start TTS engine.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="757"/>
-        <location filename="../configure.cpp" line="776"/>
+        <location filename="../configure.cpp" line="848"/>
+        <location filename="../configure.cpp" line="867"/>
         <source>
 Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="771"/>
+        <location filename="../configure.cpp" line="862"/>
         <source>Rockbox Utility Voice Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="774"/>
+        <location filename="../configure.cpp" line="865"/>
         <source>Could not voice test string.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="775"/>
+        <location filename="../configure.cpp" line="866"/>
         <source>Could not voice test string.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="283"/>
+        <location filename="../configure.cpp" line="301"/>
         <source>Current cache size is %L1 kiB.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="552"/>
-        <source>Select your device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configure.cpp" line="659"/>
+        <location filename="../configure.cpp" line="750"/>
         <source>Fatal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="400"/>
-        <location filename="../configure.cpp" line="430"/>
+        <location filename="../configure.cpp" line="418"/>
+        <location filename="../configure.cpp" line="448"/>
         <source>Configuration OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="406"/>
-        <location filename="../configure.cpp" line="435"/>
+        <location filename="../configure.cpp" line="424"/>
+        <location filename="../configure.cpp" line="453"/>
         <source>Configuration INVALID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="112"/>
+        <location filename="../configure.cpp" line="122"/>
         <source>The following errors occurred:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="145"/>
+        <location filename="../configure.cpp" line="156"/>
         <source>No mountpoint given</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="149"/>
+        <location filename="../configure.cpp" line="160"/>
         <source>Mountpoint does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="153"/>
+        <location filename="../configure.cpp" line="164"/>
         <source>Mountpoint is not a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="157"/>
+        <location filename="../configure.cpp" line="168"/>
         <source>Mountpoint is not writeable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="171"/>
+        <location filename="../configure.cpp" line="183"/>
         <source>No player selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="178"/>
+        <location filename="../configure.cpp" line="190"/>
         <source>Cache path not writeable. Leave path empty to default to systems temporary path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="197"/>
+        <location filename="../configure.cpp" line="210"/>
         <source>You need to fix the above errors before you can continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configure.cpp" line="200"/>
+        <location filename="../configure.cpp" line="213"/>
         <source>Configuration error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1051,8 +1156,7 @@ Please configure TTS engine.</source>
         <translation>请选择你的播放器在你的 &amp;文件系统</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="56"/>
-        <location filename="../configurefrm.ui" line="303"/>
+        <location filename="../configurefrm.ui" line="312"/>
         <source>&amp;Browse</source>
         <translation>&amp;浏览</translation>
     </message>
@@ -1062,142 +1166,152 @@ Please configure TTS engine.</source>
         <translation>&amp;选择你的音乐播放器</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="105"/>
+        <location filename="../configurefrm.ui" line="58"/>
+        <source>&amp;Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurefrm.ui" line="114"/>
         <source>&amp;Autodetect</source>
         <translation>自动识别(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="127"/>
+        <location filename="../configurefrm.ui" line="136"/>
         <source>&amp;Proxy</source>
         <translation>网络代理服务(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="133"/>
+        <location filename="../configurefrm.ui" line="142"/>
         <source>&amp;No Proxy</source>
         <translation>没有网络代理服务(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="143"/>
+        <location filename="../configurefrm.ui" line="152"/>
         <source>Use S&amp;ystem values</source>
         <translation>使用系统值(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="150"/>
+        <location filename="../configurefrm.ui" line="159"/>
         <source>&amp;Manual Proxy settings</source>
         <translation>手动设置代理服务(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="157"/>
+        <location filename="../configurefrm.ui" line="166"/>
         <source>Proxy Values</source>
         <translation>代理服务值</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="163"/>
+        <location filename="../configurefrm.ui" line="172"/>
         <source>&amp;Host:</source>
         <translation>&amp;主机:</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="180"/>
+        <location filename="../configurefrm.ui" line="189"/>
         <source>&amp;Port:</source>
         <translation>&amp;接口:</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="203"/>
+        <location filename="../configurefrm.ui" line="212"/>
         <source>&amp;Username</source>
         <translation>&amp;用户名</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="213"/>
+        <location filename="../configurefrm.ui" line="222"/>
         <source>Pass&amp;word</source>
         <translation>&amp;密码</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="244"/>
+        <location filename="../configurefrm.ui" line="253"/>
         <source>&amp;Language</source>
         <translation>&amp;语言</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="258"/>
+        <location filename="../configurefrm.ui" line="267"/>
         <source>Cac&amp;he</source>
         <translation>&amp;缓冲</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="261"/>
+        <location filename="../configurefrm.ui" line="270"/>
         <source>Download cache settings</source>
         <translation>下载缓冲设置</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="267"/>
+        <location filename="../configurefrm.ui" line="276"/>
         <source>Rockbox Utility uses a local download cache to save network traffic. You can change the path to the cache and use it as local repository by enabling Offline mode.</source>
         <translation>Rockbox 安装程序使用本机缓冲来保存网络资料. 你可以改变这个缓冲的路径. 启动下线模式后, 你还可以用路径来保存文件.</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="277"/>
+        <location filename="../configurefrm.ui" line="286"/>
         <source>Current cache size is %1</source>
         <translation>现在缓冲大小是 %1</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="286"/>
+        <location filename="../configurefrm.ui" line="295"/>
         <source>P&amp;ath</source>
         <translation>&amp;路径</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="296"/>
+        <location filename="../configurefrm.ui" line="305"/>
         <source>Entering an invalid folder will reset the path to the systems temporary path.</source>
         <translation>输入无效地址会重设到系统临时文件夹.</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="318"/>
+        <location filename="../configurefrm.ui" line="327"/>
         <source>Disable local &amp;download cache</source>
         <translation>&amp;不使用本机缓冲</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="325"/>
+        <location filename="../configurefrm.ui" line="334"/>
         <source>&lt;p&gt;This will try to use all information from the cache, even information about updates. Only use this option if you want to install without network connection. Note: you need to do the same install you want to perform later with network access first to download all required files to the cache.&lt;/p&gt;</source>
         <translation>&lt;p&gt;所有资料, 包括更新资料, 将会从本机缓冲里拿取. 不要选择此模式如果你不需要下线安装. 注意: 你需要先用网络做至少一次安装才可以下载到需要的文件.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="328"/>
+        <location filename="../configurefrm.ui" line="337"/>
         <source>O&amp;ffline mode</source>
         <translation>&amp;下线安装</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="363"/>
+        <location filename="../configurefrm.ui" line="372"/>
         <source>Clean cache &amp;now</source>
         <translation>&amp;现在清除缓冲文件夹</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="379"/>
+        <location filename="../configurefrm.ui" line="388"/>
         <source>&amp;TTS &amp;&amp; Encoder</source>
         <translation>&amp;TTS &amp;&amp; 信号转换器</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="385"/>
+        <location filename="../configurefrm.ui" line="394"/>
         <source>TTS Engine</source>
         <translation>TTS 引擎</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="439"/>
+        <location filename="../configurefrm.ui" line="448"/>
         <source>Test TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="449"/>
+        <location filename="../configurefrm.ui" line="455"/>
+        <source>&amp;Use string corrections for TTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurefrm.ui" line="465"/>
         <source>Encoder Engine</source>
         <translation>信号转换器引擎</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="523"/>
+        <location filename="../configurefrm.ui" line="539"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="534"/>
+        <location filename="../configurefrm.ui" line="550"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="391"/>
+        <location filename="../configurefrm.ui" line="400"/>
         <source>&amp;Select TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1207,28 +1321,28 @@ Please configure TTS engine.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="404"/>
+        <location filename="../configurefrm.ui" line="413"/>
         <source>Configure TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="411"/>
-        <location filename="../configurefrm.ui" line="455"/>
+        <location filename="../configurefrm.ui" line="420"/>
+        <location filename="../configurefrm.ui" line="471"/>
         <source>Configuration invalid!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="428"/>
+        <location filename="../configurefrm.ui" line="437"/>
         <source>Configure &amp;TTS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="472"/>
+        <location filename="../configurefrm.ui" line="488"/>
         <source>Configure &amp;Enc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurefrm.ui" line="483"/>
+        <location filename="../configurefrm.ui" line="499"/>
         <source>encoder name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1236,7 +1350,7 @@ Please configure TTS engine.</source>
 <context>
     <name>Configure</name>
     <message>
-        <location filename="../configure.cpp" line="535"/>
+        <location filename="../configure.cpp" line="553"/>
         <source>English</source>
         <comment>This is the localized language name, i.e. your language.</comment>
         <translation type="unfinished">中文 (Chinese Simplified)</translation>
@@ -1299,87 +1413,142 @@ Please configure TTS engine.</source>
 <context>
     <name>CreateVoiceWindow</name>
     <message>
-        <location filename="../createvoicewindow.cpp" line="99"/>
-        <location filename="../createvoicewindow.cpp" line="102"/>
+        <location filename="../createvoicewindow.cpp" line="97"/>
+        <location filename="../createvoicewindow.cpp" line="100"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../createvoicewindow.cpp" line="110"/>
-        <location filename="../createvoicewindow.cpp" line="113"/>
-        <location filename="../createvoicewindow.cpp" line="117"/>
+        <location filename="../createvoicewindow.cpp" line="108"/>
+        <location filename="../createvoicewindow.cpp" line="111"/>
+        <location filename="../createvoicewindow.cpp" line="115"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EncExes</name>
+    <name>EncTtsCfgGui</name>
+    <message>
+        <location filename="../encttscfggui.cpp" line="31"/>
+        <source>Waiting for engine...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="81"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="84"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="183"/>
+        <source>Browse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="191"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../encttscfggui.cpp" line="363"/>
+        <source>Select executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EncoderExe</name>
     <message>
-        <location filename="../base/encoders.cpp" line="95"/>
+        <location filename="../base/encoderexe.cpp" line="40"/>
         <source>Path to Encoder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/encoders.cpp" line="97"/>
+        <location filename="../base/encoderexe.cpp" line="42"/>
         <source>Encoder options:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EncRbSpeex</name>
+    <name>EncoderLame</name>
     <message>
-        <location filename="../base/encoders.cpp" line="161"/>
-        <source>Volume:</source>
+        <location filename="../base/encoderlame.cpp" line="69"/>
+        <location filename="../base/encoderlame.cpp" line="79"/>
+        <source>LAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/encoders.cpp" line="163"/>
-        <source>Quality:</source>
+        <location filename="../base/encoderlame.cpp" line="71"/>
+        <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/encoders.cpp" line="165"/>
-        <source>Complexity:</source>
+        <location filename="../base/encoderlame.cpp" line="75"/>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/encoders.cpp" line="167"/>
-        <source>Use Narrowband:</source>
+        <location filename="../base/encoderlame.cpp" line="79"/>
+        <source>Could not find libmp3lame!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EncTtsCfgGui</name>
+    <name>EncoderRbSpeex</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="32"/>
-        <source>Waiting for engine...</source>
+        <location filename="../base/encoderrbspeex.cpp" line="33"/>
+        <source>Volume:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="82"/>
-        <source>Ok</source>
+        <location filename="../base/encoderrbspeex.cpp" line="35"/>
+        <source>Quality:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="85"/>
-        <source>Cancel</source>
+        <location filename="../base/encoderrbspeex.cpp" line="37"/>
+        <source>Complexity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="184"/>
-        <source>Browse</source>
+        <location filename="../base/encoderrbspeex.cpp" line="39"/>
+        <source>Use Narrowband:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>InfoWidget</name>
     <message>
-        <location filename="../encttscfggui.cpp" line="192"/>
-        <source>Refresh</source>
+        <location filename="../gui/infowidget.cpp" line="29"/>
+        <source>File</source>
+        <translation type="unfinished">文件</translation>
+    </message>
+    <message>
+        <location filename="../gui/infowidget.cpp" line="29"/>
+        <source>Version</source>
+        <translation type="unfinished">版本</translation>
+    </message>
+</context>
+<context>
+    <name>InfoWidgetFrm</name>
+    <message>
+        <location filename="../gui/infowidgetfrm.ui" line="14"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../encttscfggui.cpp" line="364"/>
-        <source>Select executable</source>
+        <location filename="../gui/infowidgetfrm.ui" line="20"/>
+        <source>Currently installed packages.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; if you manually installed packages this might not be correct!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/infowidgetfrm.ui" line="34"/>
+        <source>1</source>
+        <translation type="unfinished">1</translation>
+    </message>
 </context>
 <context>
     <name>InstallTalkFrm</name>
@@ -1472,25 +1641,25 @@ Please configure TTS engine.</source>
 <context>
     <name>InstallTalkWindow</name>
     <message>
-        <location filename="../installtalkwindow.cpp" line="56"/>
+        <location filename="../installtalkwindow.cpp" line="54"/>
         <source>Select folder to create talk files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="91"/>
+        <location filename="../installtalkwindow.cpp" line="89"/>
         <source>The Folder to Talk is wrong!</source>
         <translation>要支持语音的文件夹错误!</translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="124"/>
-        <location filename="../installtalkwindow.cpp" line="127"/>
+        <location filename="../installtalkwindow.cpp" line="122"/>
+        <location filename="../installtalkwindow.cpp" line="125"/>
         <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installtalkwindow.cpp" line="134"/>
-        <location filename="../installtalkwindow.cpp" line="137"/>
-        <location filename="../installtalkwindow.cpp" line="141"/>
+        <location filename="../installtalkwindow.cpp" line="132"/>
+        <location filename="../installtalkwindow.cpp" line="135"/>
+        <location filename="../installtalkwindow.cpp" line="139"/>
         <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1498,72 +1667,72 @@ Please configure TTS engine.</source>
 <context>
     <name>InstallWindow</name>
     <message>
-        <location filename="../installwindow.cpp" line="108"/>
+        <location filename="../installwindow.cpp" line="107"/>
         <source>Backup to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="138"/>
+        <location filename="../installwindow.cpp" line="137"/>
         <source>Mount point is wrong!</source>
         <translation type="unfinished">Mountpoint 错误!</translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="175"/>
+        <location filename="../installwindow.cpp" line="174"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="179"/>
+        <location filename="../installwindow.cpp" line="178"/>
         <source>Aborted!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="188"/>
+        <location filename="../installwindow.cpp" line="187"/>
         <source>Beginning Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="210"/>
+        <location filename="../installwindow.cpp" line="209"/>
         <source>Backup finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="213"/>
+        <location filename="../installwindow.cpp" line="212"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="244"/>
+        <location filename="../installwindow.cpp" line="243"/>
         <source>Select Backup Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="277"/>
+        <location filename="../installwindow.cpp" line="276"/>
         <source>This is the absolute up to the minute Rockbox built. A current build will get updated every time a change is made. Latest version is %1 (%2).</source>
         <translation type="unfinished">这是最新的Rockbox版本. 每一个更改后这版本就会更新. 最新的版本是 %1 (%2).</translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="283"/>
+        <location filename="../installwindow.cpp" line="282"/>
         <source>&lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="294"/>
+        <location filename="../installwindow.cpp" line="293"/>
         <source>This is the last released version of Rockbox.</source>
         <translation type="unfinished">这是最新的Rockbox版本.</translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="297"/>
+        <location filename="../installwindow.cpp" line="296"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; The lastest released version is %1. &lt;b&gt;This is the recommended version.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="309"/>
+        <location filename="../installwindow.cpp" line="308"/>
         <source>These are automatically built each day from the current development source code. This generally has more features than the last stable release but may be much less stable. Features may change regularly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../installwindow.cpp" line="313"/>
+        <location filename="../installwindow.cpp" line="312"/>
         <source>&lt;b&gt;Note:&lt;/b&gt; archived version is %1 (%2).</source>
         <translation type="unfinished">&lt;b&gt;注意:&lt;/b&gt; 存档的版本是 %1 (%2).</translation>
     </message>
@@ -1657,6 +1826,82 @@ Please configure TTS engine.</source>
     </message>
 </context>
 <context>
+    <name>ManualWidget</name>
+    <message>
+        <location filename="../gui/manualwidget.cpp" line="78"/>
+        <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
+        <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;PDF 用户手册(英文)&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidget.cpp" line="80"/>
+        <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
+        <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;HTML 用户手册(英文,在浏览器打开)&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidget.cpp" line="84"/>
+        <source>Select a device for a link to the correct manual</source>
+        <translation type="unfinished">请选择你的播放器</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidget.cpp" line="85"/>
+        <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
+        <translation type="unfinished">&lt;a href=&apos;%1&apos;&gt;用户手册总观&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidget.cpp" line="96"/>
+        <source>Confirm download</source>
+        <translation type="unfinished">确认下载</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidget.cpp" line="97"/>
+        <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
+        <translation type="unfinished">你确认要下载用户手册吗? 用户手册将会被放在你播放器的主目录里.</translation>
+    </message>
+</context>
+<context>
+    <name>ManualWidgetFrm</name>
+    <message>
+        <location filename="../gui/manualwidgetfrm.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidgetfrm.ui" line="20"/>
+        <source>Read the manual</source>
+        <translation type="unfinished">查看用户手册</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidgetfrm.ui" line="26"/>
+        <source>PDF manual</source>
+        <translation type="unfinished">PDF 用户手册</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidgetfrm.ui" line="39"/>
+        <source>HTML manual</source>
+        <translation type="unfinished">HTML 用户手册</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidgetfrm.ui" line="55"/>
+        <source>Download the manual</source>
+        <translation type="unfinished">下载用户手册</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidgetfrm.ui" line="63"/>
+        <source>&amp;PDF version</source>
+        <translation type="unfinished">PDF 版本</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidgetfrm.ui" line="70"/>
+        <source>&amp;HTML version (zip file)</source>
+        <translation type="unfinished">HTML 版本 (zip)</translation>
+    </message>
+    <message>
+        <location filename="../gui/manualwidgetfrm.ui" line="92"/>
+        <source>Down&amp;load</source>
+        <translation type="unfinished">下载</translation>
+    </message>
+</context>
+<context>
     <name>PreviewFrm</name>
     <message>
         <location filename="../previewfrm.ui" line="16"/>
@@ -1691,17 +1936,17 @@ Please configure TTS engine.</source>
 <context>
     <name>ProgressLoggerGui</name>
     <message>
-        <location filename="../progressloggergui.cpp" line="122"/>
+        <location filename="../progressloggergui.cpp" line="121"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="145"/>
+        <location filename="../progressloggergui.cpp" line="144"/>
         <source>Save system trace log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../progressloggergui.cpp" line="104"/>
+        <location filename="../progressloggergui.cpp" line="103"/>
         <source>&amp;Abort</source>
         <translation>&amp;取消</translation>
     </message>
@@ -1709,18 +1954,21 @@ Please configure TTS engine.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../main.cpp" line="71"/>
+        <location filename="../configure.cpp" line="589"/>
+        <location filename="../main.cpp" line="70"/>
         <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>
+        <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.
+----------
+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>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="376"/>
+        <location filename="../base/system.cpp" line="384"/>
         <source>(unknown vendor name) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="394"/>
+        <location filename="../base/system.cpp" line="402"/>
         <source>(unknown product name)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1736,390 +1984,355 @@ Please configure TTS engine.</source>
 <context>
     <name>RbUtilQt</name>
     <message>
-        <location filename="../rbutilqt.cpp" line="104"/>
-        <source>File</source>
-        <translation>文件</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="104"/>
-        <source>Version</source>
-        <translation>版本</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="205"/>
-        <location filename="../rbutilqt.cpp" line="238"/>
+        <location filename="../rbutilqt.cpp" line="227"/>
+        <location filename="../rbutilqt.cpp" line="260"/>
         <source>Downloading build information, please wait ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="216"/>
-        <location filename="../rbutilqt.cpp" line="247"/>
+        <location filename="../rbutilqt.cpp" line="238"/>
+        <location filename="../rbutilqt.cpp" line="269"/>
         <source>Can&apos;t get version information!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="259"/>
+        <location filename="../rbutilqt.cpp" line="281"/>
         <source>Download build information finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="377"/>
+        <location filename="../rbutilqt.cpp" line="411"/>
         <source>&lt;b&gt;%1 %2&lt;/b&gt; at &lt;b&gt;%3&lt;/b&gt;</source>
         <translation>&lt;b&gt;%1 %2&lt;/b&gt; 在 &lt;b&gt;%3&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="404"/>
-        <source>&lt;a href=&apos;%1&apos;&gt;PDF Manual&lt;/a&gt;</source>
-        <translation>&lt;a href=&apos;%1&apos;&gt;PDF 用户手册(英文)&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="406"/>
-        <source>&lt;a href=&apos;%1&apos;&gt;HTML Manual (opens in browser)&lt;/a&gt;</source>
-        <translation>&lt;a href=&apos;%1&apos;&gt;HTML 用户手册(英文,在浏览器打开)&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="410"/>
-        <source>Select a device for a link to the correct manual</source>
-        <translation>请选择你的播放器</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="411"/>
-        <source>&lt;a href=&apos;%1&apos;&gt;Manual Overview&lt;/a&gt;</source>
-        <translation>&lt;a href=&apos;%1&apos;&gt;用户手册总观&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="420"/>
-        <location filename="../rbutilqt.cpp" line="476"/>
-        <location filename="../rbutilqt.cpp" line="653"/>
-        <location filename="../rbutilqt.cpp" line="819"/>
-        <location filename="../rbutilqt.cpp" line="906"/>
-        <location filename="../rbutilqt.cpp" line="950"/>
+        <location filename="../rbutilqt.cpp" line="426"/>
+        <location filename="../rbutilqt.cpp" line="482"/>
+        <location filename="../rbutilqt.cpp" line="659"/>
+        <location filename="../rbutilqt.cpp" line="830"/>
+        <location filename="../rbutilqt.cpp" line="917"/>
+        <location filename="../rbutilqt.cpp" line="961"/>
         <source>Confirm Installation</source>
         <translation>确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="499"/>
-        <location filename="../rbutilqt.cpp" line="1141"/>
+        <location filename="../rbutilqt.cpp" line="505"/>
+        <location filename="../rbutilqt.cpp" line="1105"/>
         <source>Mount point is wrong!</source>
         <translation>Mountpoint 错误!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="594"/>
+        <location filename="../rbutilqt.cpp" line="600"/>
         <source>Beginning Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="654"/>
+        <location filename="../rbutilqt.cpp" line="660"/>
         <source>Do you really want to install the Bootloader?</source>
         <translation>你确认要安装启动程序?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="813"/>
-        <location filename="../rbutilqt.cpp" line="891"/>
+        <location filename="../rbutilqt.cpp" line="771"/>
+        <source>Error reading firmware file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../rbutilqt.cpp" line="824"/>
+        <location filename="../rbutilqt.cpp" line="902"/>
         <source>No Rockbox installation found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="814"/>
+        <location filename="../rbutilqt.cpp" line="825"/>
         <source>Could not determine the installed Rockbox version. Please install a Rockbox build before installing fonts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="820"/>
+        <location filename="../rbutilqt.cpp" line="831"/>
         <source>Do you really want to install the fonts package?</source>
         <translation>你确认要安装字体包裹吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="892"/>
+        <location filename="../rbutilqt.cpp" line="903"/>
         <source>Could not determine the installed Rockbox version. Please install a Rockbox build before installing voice files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="907"/>
+        <location filename="../rbutilqt.cpp" line="918"/>
         <source>Do you really want to install the voice file?</source>
         <translation>你确认要安装语音文件吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="951"/>
+        <location filename="../rbutilqt.cpp" line="962"/>
         <source>Do you really want to install the game addon files?</source>
         <translation>你确认要安装游戏附件吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1029"/>
+        <location filename="../rbutilqt.cpp" line="1040"/>
         <source>Confirm Uninstallation</source>
         <translation>确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1030"/>
+        <location filename="../rbutilqt.cpp" line="1041"/>
         <source>Do you really want to uninstall the Bootloader?</source>
         <translation>你确认要卸载启动程序吗?</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1044"/>
+        <location filename="../rbutilqt.cpp" line="1055"/>
         <source>No uninstall method for this target known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1050"/>
+        <location filename="../rbutilqt.cpp" line="1072"/>
         <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>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1079"/>
-        <source>Confirm download</source>
-        <translation>确认下载</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="1080"/>
-        <source>Do you really want to download the manual? The manual will be saved to the root folder of your player.</source>
-        <translation>你确认要下载用户手册吗? 用户手册将会被放在你播放器的主目录里.</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqt.cpp" line="1127"/>
+        <location filename="../rbutilqt.cpp" line="1091"/>
         <source>Confirm installation</source>
         <translation>确认安装</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1128"/>
+        <location filename="../rbutilqt.cpp" line="1092"/>
         <source>Do you really want to install Rockbox Utility to your player? After installation you can run it from the players hard drive.</source>
         <translation>你确认要安装Rockbox安装程序到你的播放器上吗? 安装后你可以从你播放器上运行此程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1137"/>
+        <location filename="../rbutilqt.cpp" line="1101"/>
         <source>Installing Rockbox Utility</source>
         <translation>安装 Rockbox安装程序</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1155"/>
+        <location filename="../rbutilqt.cpp" line="1119"/>
         <source>Error installing Rockbox Utility</source>
         <translation>安装 Rockbox安装程序错误!</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1159"/>
+        <location filename="../rbutilqt.cpp" line="1123"/>
         <source>Installing user configuration</source>
         <translation>安装用户设置</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1163"/>
+        <location filename="../rbutilqt.cpp" line="1127"/>
         <source>Error installing user configuration</source>
         <translation>安装用户设置错误</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1167"/>
+        <location filename="../rbutilqt.cpp" line="1131"/>
         <source>Successfully installed Rockbox Utility.</source>
         <translation>成功安装 Rockbox安装程序.</translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1281"/>
+        <location filename="../rbutilqt.cpp" line="1183"/>
         <source>Checking for update ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1346"/>
+        <location filename="../rbutilqt.cpp" line="1248"/>
         <source>RockboxUtility Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1347"/>
+        <location filename="../rbutilqt.cpp" line="1249"/>
         <source>&lt;b&gt;New RockboxUtility Version available.&lt;/b&gt; &lt;br&gt;&lt;br&gt;Download it from here: &lt;a href=&apos;%1&apos;&gt;%2&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1350"/>
+        <location filename="../rbutilqt.cpp" line="1252"/>
         <source>New version of Rockbox Utility available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1353"/>
+        <location filename="../rbutilqt.cpp" line="1255"/>
         <source>Rockbox Utility is up to date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="337"/>
-        <location filename="../rbutilqt.cpp" line="1257"/>
+        <location filename="../rbutilqt.cpp" line="365"/>
+        <location filename="../rbutilqt.cpp" line="1159"/>
         <source>Configuration error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="945"/>
+        <location filename="../rbutilqt.cpp" line="956"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="946"/>
+        <location filename="../rbutilqt.cpp" line="957"/>
         <source>Your device doesn&apos;t have a doom plugin. Aborting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="1258"/>
+        <location filename="../rbutilqt.cpp" line="1160"/>
         <source>Your configuration is invalid. Please go to the configuration dialog and make sure the selected values are correct.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="330"/>
+        <location filename="../rbutilqt.cpp" line="358"/>
         <source>This is a new installation of Rockbox Utility, or a new version. The configuration dialog will now open to allow you to setup the program,  or review your settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="85"/>
+        <location filename="../rbutilqt.cpp" line="103"/>
         <source>Wine detected!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="86"/>
+        <location filename="../rbutilqt.cpp" line="104"/>
         <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>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="218"/>
-        <location filename="../rbutilqt.cpp" line="249"/>
+        <location filename="../rbutilqt.cpp" line="240"/>
+        <location filename="../rbutilqt.cpp" line="271"/>
         <source>Can&apos;t get version information.
 Network error: %1. Please check your network and proxy settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="567"/>
+        <location filename="../rbutilqt.cpp" line="573"/>
         <source>Aborted!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="577"/>
+        <location filename="../rbutilqt.cpp" line="583"/>
         <source>Installed Rockbox detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="578"/>
+        <location filename="../rbutilqt.cpp" line="584"/>
         <source>Rockbox installation detected. Do you want to backup first?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="612"/>
+        <location filename="../rbutilqt.cpp" line="618"/>
         <source>Backup failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="877"/>
+        <location filename="../rbutilqt.cpp" line="888"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="878"/>
+        <location filename="../rbutilqt.cpp" line="889"/>
         <source>The Application is still downloading Information about new Builds. Please try again shortly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="582"/>
+        <location filename="../rbutilqt.cpp" line="588"/>
         <source>Starting backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="329"/>
+        <location filename="../rbutilqt.cpp" line="357"/>
         <source>New installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="338"/>
+        <location filename="../rbutilqt.cpp" line="366"/>
         <source>Your configuration is invalid. This is most likely due to a changed device path. The configuration dialog will now open to allow you to correct the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="608"/>
+        <location filename="../rbutilqt.cpp" line="614"/>
         <source>Backup successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="217"/>
-        <location filename="../rbutilqt.cpp" line="248"/>
+        <location filename="../rbutilqt.cpp" line="239"/>
+        <location filename="../rbutilqt.cpp" line="270"/>
         <source>Network error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="563"/>
+        <location filename="../rbutilqt.cpp" line="569"/>
         <source>Really continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="673"/>
+        <location filename="../rbutilqt.cpp" line="679"/>
         <source>No install method known.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="693"/>
+        <location filename="../rbutilqt.cpp" line="706"/>
         <source>Bootloader detected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="694"/>
+        <location filename="../rbutilqt.cpp" line="707"/>
         <source>Bootloader already installed. Do you want to reinstall the bootloader?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="717"/>
+        <location filename="../rbutilqt.cpp" line="730"/>
         <source>Create Bootloader backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="718"/>
+        <location filename="../rbutilqt.cpp" line="731"/>
         <source>You can create a backup of the original bootloader file. Press &quot;Yes&quot; to select an output folder on your computer to save the file to. The file will get placed in a new folder &quot;%1&quot; created below the selected folder.
 Press &quot;No&quot; to skip this step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="725"/>
+        <location filename="../rbutilqt.cpp" line="738"/>
         <source>Browse backup folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="737"/>
+        <location filename="../rbutilqt.cpp" line="750"/>
         <source>Prerequisites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="750"/>
+        <location filename="../rbutilqt.cpp" line="763"/>
         <source>Select firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="752"/>
+        <location filename="../rbutilqt.cpp" line="765"/>
         <source>Error opening firmware file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="770"/>
+        <location filename="../rbutilqt.cpp" line="781"/>
         <source>Backup error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="771"/>
+        <location filename="../rbutilqt.cpp" line="782"/>
         <source>Could not create backup file. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="801"/>
+        <location filename="../rbutilqt.cpp" line="812"/>
         <source>Manual steps required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="421"/>
+        <location filename="../rbutilqt.cpp" line="427"/>
         <source>Do you really want to perform a complete installation?
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="477"/>
+        <location filename="../rbutilqt.cpp" line="483"/>
         <source>Do you really want to perform a minimal installation? A minimal installation will contain only the absolutely necessary parts to run Rockbox.
 
 This will install Rockbox %1. To install the most recent development build available press &quot;Cancel&quot; and use the &quot;Installation&quot; tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="699"/>
+        <location filename="../rbutilqt.cpp" line="712"/>
         <source>Bootloader installation skipped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqt.cpp" line="743"/>
+        <location filename="../rbutilqt.cpp" line="756"/>
         <source>Bootloader installation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2148,7 +2361,7 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
     <message>
         <location filename="../rbutilqtfrm.ui" line="128"/>
-        <location filename="../rbutilqtfrm.ui" line="832"/>
+        <location filename="../rbutilqtfrm.ui" line="711"/>
         <source>&amp;Quick Start</source>
         <translation>&amp;快速开始</translation>
     </message>
@@ -2159,7 +2372,7 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
     <message>
         <location filename="../rbutilqtfrm.ui" line="224"/>
-        <location filename="../rbutilqtfrm.ui" line="825"/>
+        <location filename="../rbutilqtfrm.ui" line="704"/>
         <source>&amp;Installation</source>
         <translation>&amp;安装</translation>
     </message>
@@ -2180,7 +2393,7 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
     <message>
         <location filename="../rbutilqtfrm.ui" line="320"/>
-        <location filename="../rbutilqtfrm.ui" line="839"/>
+        <location filename="../rbutilqtfrm.ui" line="718"/>
         <source>&amp;Extras</source>
         <translation>&amp;附加功能</translation>
     </message>
@@ -2211,7 +2424,7 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
     <message>
         <location filename="../rbutilqtfrm.ui" line="437"/>
-        <location filename="../rbutilqtfrm.ui" line="847"/>
+        <location filename="../rbutilqtfrm.ui" line="726"/>
         <source>&amp;Accessibility</source>
         <translation>&amp;辅助</translation>
     </message>
@@ -2232,7 +2445,7 @@ This will install Rockbox %1. To install the most recent development build avail
     </message>
     <message>
         <location filename="../rbutilqtfrm.ui" line="552"/>
-        <location filename="../rbutilqtfrm.ui" line="855"/>
+        <location filename="../rbutilqtfrm.ui" line="734"/>
         <source>&amp;Uninstallation</source>
         <translation>&amp;卸载</translation>
     </message>
@@ -2258,103 +2471,63 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation>查看和下载用户手册</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="657"/>
-        <source>Read the manual</source>
-        <translation>查看用户手册</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="663"/>
-        <source>PDF manual</source>
-        <translation>PDF 用户手册</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="676"/>
-        <source>HTML manual</source>
-        <translation>HTML 用户手册</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="692"/>
-        <source>Download the manual</source>
-        <translation>下载用户手册</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="700"/>
-        <source>&amp;PDF version</source>
-        <translation>PDF 版本</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="707"/>
-        <source>&amp;HTML version (zip file)</source>
-        <translation>HTML 版本 (zip)</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="729"/>
-        <source>Down&amp;load</source>
-        <translation>下载</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="753"/>
+        <location filename="../rbutilqtfrm.ui" line="656"/>
         <source>Inf&amp;o</source>
         <translation>&amp;信息</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="773"/>
-        <source>1</source>
-        <translation>1</translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="795"/>
+        <location filename="../rbutilqtfrm.ui" line="674"/>
         <source>&amp;File</source>
         <translation>&amp;文件</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="808"/>
+        <location filename="../rbutilqtfrm.ui" line="687"/>
         <source>&amp;Troubleshoot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="896"/>
+        <location filename="../rbutilqtfrm.ui" line="775"/>
         <source>&amp;About</source>
         <translation>&amp;关于</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1052"/>
+        <location filename="../rbutilqtfrm.ui" line="931"/>
         <source>System &amp;Trace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="873"/>
+        <location filename="../rbutilqtfrm.ui" line="752"/>
         <source>Empty local download cache</source>
         <translation>清除本机下载缓冲</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="878"/>
+        <location filename="../rbutilqtfrm.ui" line="757"/>
         <source>Install Rockbox Utility on player</source>
         <translation>安装Rockbox安装程序到你的播放器</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="883"/>
+        <location filename="../rbutilqtfrm.ui" line="762"/>
         <source>&amp;Configure</source>
         <translation>&amp;设置</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="888"/>
+        <location filename="../rbutilqtfrm.ui" line="767"/>
         <source>E&amp;xit</source>
         <translation>&amp;退出</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="891"/>
+        <location filename="../rbutilqtfrm.ui" line="770"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="901"/>
+        <location filename="../rbutilqtfrm.ui" line="780"/>
         <source>About &amp;Qt</source>
         <translation>关于&amp;Qt</translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="804"/>
-        <location filename="../rbutilqtfrm.ui" line="906"/>
+        <location filename="../rbutilqtfrm.ui" line="683"/>
+        <location filename="../rbutilqtfrm.ui" line="785"/>
         <source>&amp;Help</source>
         <translation>&amp;帮助</translation>
     </message>
@@ -2364,32 +2537,32 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="821"/>
+        <location filename="../rbutilqtfrm.ui" line="700"/>
         <source>Action&amp;s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="911"/>
+        <location filename="../rbutilqtfrm.ui" line="790"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1015"/>
+        <location filename="../rbutilqtfrm.ui" line="894"/>
         <source>Read PDF manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1020"/>
+        <location filename="../rbutilqtfrm.ui" line="899"/>
         <source>Read HTML manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1025"/>
+        <location filename="../rbutilqtfrm.ui" line="904"/>
         <source>Download PDF manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1030"/>
+        <location filename="../rbutilqtfrm.ui" line="909"/>
         <source>Download HTML manual (zip)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2399,7 +2572,7 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1042"/>
+        <location filename="../rbutilqtfrm.ui" line="921"/>
         <source>Create Voice File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2455,67 +2628,62 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="759"/>
-        <source>Currently installed packages.&lt;br/&gt;&lt;b&gt;Note:&lt;/b&gt; if you manually installed packages this might not be correct!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../rbutilqtfrm.ui" line="938"/>
+        <location filename="../rbutilqtfrm.ui" line="817"/>
         <source>Install &amp;Bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="947"/>
+        <location filename="../rbutilqtfrm.ui" line="826"/>
         <source>Install &amp;Rockbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="956"/>
+        <location filename="../rbutilqtfrm.ui" line="835"/>
         <source>Install &amp;Fonts Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="965"/>
+        <location filename="../rbutilqtfrm.ui" line="844"/>
         <source>Install &amp;Themes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="974"/>
+        <location filename="../rbutilqtfrm.ui" line="853"/>
         <source>Install &amp;Game Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="983"/>
+        <location filename="../rbutilqtfrm.ui" line="862"/>
         <source>&amp;Install Voice File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="992"/>
+        <location filename="../rbutilqtfrm.ui" line="871"/>
         <source>Create &amp;Talk Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1001"/>
+        <location filename="../rbutilqtfrm.ui" line="880"/>
         <source>Remove &amp;bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1010"/>
+        <location filename="../rbutilqtfrm.ui" line="889"/>
         <source>Uninstall &amp;Rockbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1039"/>
+        <location filename="../rbutilqtfrm.ui" line="918"/>
         <source>Create &amp;Voice File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="1047"/>
+        <location filename="../rbutilqtfrm.ui" line="926"/>
         <source>&amp;System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="920"/>
+        <location filename="../rbutilqtfrm.ui" line="799"/>
         <source>&amp;Complete Installation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2535,7 +2703,7 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rbutilqtfrm.ui" line="929"/>
+        <location filename="../rbutilqtfrm.ui" line="808"/>
         <source>&amp;Minimal Installation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2543,22 +2711,22 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ServerInfo</name>
     <message>
-        <location filename="../base/serverinfo.cpp" line="72"/>
+        <location filename="../base/serverinfo.cpp" line="71"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/serverinfo.cpp" line="76"/>
+        <location filename="../base/serverinfo.cpp" line="75"/>
         <source>Unusable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/serverinfo.cpp" line="79"/>
+        <location filename="../base/serverinfo.cpp" line="78"/>
         <source>Unstable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/serverinfo.cpp" line="82"/>
+        <location filename="../base/serverinfo.cpp" line="81"/>
         <source>Stable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2566,8 +2734,8 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>SysTrace</name>
     <message>
-        <location filename="../systrace.cpp" line="76"/>
-        <location filename="../systrace.cpp" line="85"/>
+        <location filename="../systrace.cpp" line="75"/>
+        <location filename="../systrace.cpp" line="84"/>
         <source>Save system trace log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2608,38 +2776,63 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>Sysinfo</name>
     <message>
-        <location filename="../sysinfo.cpp" line="45"/>
+        <location filename="../sysinfo.cpp" line="44"/>
         <source>&lt;b&gt;OS&lt;/b&gt;&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="46"/>
+        <location filename="../sysinfo.cpp" line="45"/>
         <source>&lt;b&gt;Username&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="48"/>
+        <location filename="../sysinfo.cpp" line="47"/>
         <source>&lt;b&gt;Permissions&lt;/b&gt;&lt;br/&gt;%1&lt;hr/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="50"/>
+        <location filename="../sysinfo.cpp" line="49"/>
         <source>&lt;b&gt;Attached USB devices&lt;/b&gt;&lt;br/&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="54"/>
+        <location filename="../sysinfo.cpp" line="53"/>
         <source>VID: %1 PID: %2, %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinfo.cpp" line="63"/>
+        <location filename="../sysinfo.cpp" line="62"/>
         <source>Filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinfo.cpp" line="65"/>
+        <source>Mountpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinfo.cpp" line="65"/>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinfo.cpp" line="66"/>
+        <source>Free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinfo.cpp" line="66"/>
-        <source>%1, %2 MiB available</source>
+        <source>Total</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinfo.cpp" line="67"/>
+        <source>Cluster Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinfo.cpp" line="69"/>
+        <source>&lt;tr&gt;&lt;td&gt;%1&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;td&gt;%2 GiB&lt;/td&gt;&lt;td&gt;%3 GiB&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2664,28 +2857,28 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>System</name>
     <message>
-        <location filename="../base/system.cpp" line="121"/>
+        <location filename="../base/system.cpp" line="120"/>
         <source>Guest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="124"/>
+        <location filename="../base/system.cpp" line="123"/>
         <source>Admin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="127"/>
+        <location filename="../base/system.cpp" line="126"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="130"/>
+        <location filename="../base/system.cpp" line="129"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/system.cpp" line="269"/>
-        <location filename="../base/system.cpp" line="314"/>
+        <location filename="../base/system.cpp" line="277"/>
+        <location filename="../base/system.cpp" line="322"/>
         <source>(no description available)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2693,32 +2886,32 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSBase</name>
     <message>
-        <location filename="../base/ttsbase.cpp" line="40"/>
+        <location filename="../base/ttsbase.cpp" line="39"/>
         <source>Espeak TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="41"/>
+        <location filename="../base/ttsbase.cpp" line="40"/>
         <source>Flite TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="42"/>
+        <location filename="../base/ttsbase.cpp" line="41"/>
         <source>Swift TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="44"/>
+        <location filename="../base/ttsbase.cpp" line="43"/>
         <source>SAPI TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="47"/>
+        <location filename="../base/ttsbase.cpp" line="46"/>
         <source>Festival TTS Engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsbase.cpp" line="50"/>
+        <location filename="../base/ttsbase.cpp" line="49"/>
         <source>OS X System Engine</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2726,27 +2919,27 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSCarbon</name>
     <message>
-        <location filename="../base/ttscarbon.cpp" line="139"/>
+        <location filename="../base/ttscarbon.cpp" line="138"/>
         <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttscarbon.cpp" line="145"/>
+        <location filename="../base/ttscarbon.cpp" line="144"/>
         <source>Speed (words/min):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttscarbon.cpp" line="152"/>
+        <location filename="../base/ttscarbon.cpp" line="151"/>
         <source>Pitch (0 for default):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttscarbon.cpp" line="222"/>
+        <location filename="../base/ttscarbon.cpp" line="221"/>
         <source>Could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttscarbon.cpp" line="232"/>
+        <location filename="../base/ttscarbon.cpp" line="231"/>
         <source>Could not convert intermediate file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2754,17 +2947,17 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSExes</name>
     <message>
-        <location filename="../base/ttsexes.cpp" line="73"/>
+        <location filename="../base/ttsexes.cpp" line="77"/>
         <source>TTS executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsexes.cpp" line="45"/>
+        <location filename="../base/ttsexes.cpp" line="42"/>
         <source>Path to TTS engine:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsexes.cpp" line="47"/>
+        <location filename="../base/ttsexes.cpp" line="44"/>
         <source>TTS engine options:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2772,27 +2965,27 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSFestival</name>
     <message>
-        <location filename="../base/ttsfestival.cpp" line="202"/>
+        <location filename="../base/ttsfestival.cpp" line="201"/>
         <source>engine could not voice string</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsfestival.cpp" line="285"/>
+        <location filename="../base/ttsfestival.cpp" line="284"/>
         <source>No description available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsfestival.cpp" line="50"/>
+        <location filename="../base/ttsfestival.cpp" line="49"/>
         <source>Path to Festival client:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsfestival.cpp" line="55"/>
+        <location filename="../base/ttsfestival.cpp" line="54"/>
         <source>Voice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ttsfestival.cpp" line="64"/>
+        <location filename="../base/ttsfestival.cpp" line="63"/>
         <source>Voice description:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2800,16 +2993,6 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>TTSSapi</name>
     <message>
-        <location filename="../base/ttssapi.cpp" line="106"/>
-        <source>Could not copy the Sapi-script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../base/ttssapi.cpp" line="127"/>
-        <source>Could not start the Sapi-script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../base/ttssapi.cpp" line="43"/>
         <source>Language:</source>
         <translation type="unfinished"></translation>
@@ -2829,11 +3012,21 @@ This will install Rockbox %1. To install the most recent development build avail
         <source>Options:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../base/ttssapi.cpp" line="106"/>
+        <source>Could not copy the SAPI script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../base/ttssapi.cpp" line="127"/>
+        <source>Could not start SAPI process</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TalkFileCreator</name>
     <message>
-        <location filename="../base/talkfile.cpp" line="36"/>
+        <location filename="../base/talkfile.cpp" line="35"/>
         <source>Starting Talk file generation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2858,7 +3051,7 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="44"/>
+        <location filename="../base/talkfile.cpp" line="43"/>
         <source>Talk file creation aborted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2868,7 +3061,7 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkfile.cpp" line="41"/>
+        <location filename="../base/talkfile.cpp" line="40"/>
         <source>Reading Filelist...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2911,24 +3104,23 @@ This will install Rockbox %1. To install the most recent development build avail
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="164"/>
-        <location filename="../base/talkgenerator.cpp" line="295"/>
+        <location filename="../base/talkgenerator.cpp" line="118"/>
         <source>Voicing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="202"/>
-        <location filename="../base/talkgenerator.cpp" line="207"/>
+        <location filename="../base/talkgenerator.cpp" line="154"/>
+        <location filename="../base/talkgenerator.cpp" line="159"/>
         <source>Voicing of %1 failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="300"/>
+        <location filename="../base/talkgenerator.cpp" line="203"/>
         <source>Encoding aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/talkgenerator.cpp" line="284"/>
+        <location filename="../base/talkgenerator.cpp" line="230"/>
         <source>Encoding of %1 failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2974,98 +3166,98 @@ This will install Rockbox %1. To install the most recent development build avail
 <context>
     <name>ThemesInstallWindow</name>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="39"/>
+        <location filename="../themesinstallwindow.cpp" line="38"/>
         <source>no theme selected</source>
         <translation>没有选择主题</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="111"/>
+        <location filename="../themesinstallwindow.cpp" line="110"/>
         <source>Network error: %1.
 Please check your network and proxy settings.</source>
         <translation>网络错误： %1. 
 请检查你的网络和代理服务的设置.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="130"/>
+        <location filename="../themesinstallwindow.cpp" line="129"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="197"/>
+        <location filename="../themesinstallwindow.cpp" line="196"/>
         <source>fetching details for %1</source>
         <translation>正在拿取 %1 的细节</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="200"/>
+        <location filename="../themesinstallwindow.cpp" line="199"/>
         <source>fetching preview ...</source>
         <translation>正在拿取预览...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="213"/>
+        <location filename="../themesinstallwindow.cpp" line="212"/>
         <source>&lt;b&gt;Author:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;作者:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="214"/>
-        <location filename="../themesinstallwindow.cpp" line="216"/>
+        <location filename="../themesinstallwindow.cpp" line="213"/>
+        <location filename="../themesinstallwindow.cpp" line="215"/>
         <source>unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="215"/>
+        <location filename="../themesinstallwindow.cpp" line="214"/>
         <source>&lt;b&gt;Version:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;版本:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="217"/>
+        <location filename="../themesinstallwindow.cpp" line="216"/>
         <source>&lt;b&gt;Description:&lt;/b&gt; %1&lt;hr/&gt;</source>
         <translation>&lt;b&gt;描述:&lt;/b&gt; %1&lt;hr/&gt;</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="218"/>
+        <location filename="../themesinstallwindow.cpp" line="217"/>
         <source>no description</source>
         <translation>无描述</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="261"/>
+        <location filename="../themesinstallwindow.cpp" line="260"/>
         <source>no theme preview</source>
         <translation>无主题预览</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="292"/>
+        <location filename="../themesinstallwindow.cpp" line="291"/>
         <source>getting themes information ...</source>
         <translation>正在拿取主题信息...</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="340"/>
+        <location filename="../themesinstallwindow.cpp" line="339"/>
         <source>Mount point is wrong!</source>
         <translation>Mountpoint 错误!</translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="124"/>
+        <location filename="../themesinstallwindow.cpp" line="123"/>
         <source>the following error occured:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="40"/>
+        <location filename="../themesinstallwindow.cpp" line="39"/>
         <source>no selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="167"/>
+        <location filename="../themesinstallwindow.cpp" line="166"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../themesinstallwindow.cpp" line="184"/>
+        <location filename="../themesinstallwindow.cpp" line="183"/>
         <source>Download size %L1 kiB (%n item(s))</source>
         <translation type="unfinished">
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../themesinstallwindow.cpp" line="249"/>
+        <location filename="../themesinstallwindow.cpp" line="248"/>
         <source>Retrieving theme preview failed.
 HTTP response code: %1</source>
         <translation type="unfinished"></translation>
@@ -3122,28 +3314,28 @@ HTTP response code: %1</source>
 <context>
     <name>Uninstaller</name>
     <message>
-        <location filename="../base/uninstall.cpp" line="32"/>
-        <location filename="../base/uninstall.cpp" line="43"/>
+        <location filename="../base/uninstall.cpp" line="31"/>
+        <location filename="../base/uninstall.cpp" line="42"/>
         <source>Starting Uninstallation</source>
         <translation>开始卸载</translation>
     </message>
     <message>
-        <location filename="../base/uninstall.cpp" line="36"/>
+        <location filename="../base/uninstall.cpp" line="35"/>
         <source>Finished Uninstallation</source>
         <translation>完成卸载</translation>
     </message>
     <message>
-        <location filename="../base/uninstall.cpp" line="49"/>
+        <location filename="../base/uninstall.cpp" line="48"/>
         <source>Uninstalling %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/uninstall.cpp" line="80"/>
+        <location filename="../base/uninstall.cpp" line="79"/>
         <source>Could not delete %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/uninstall.cpp" line="109"/>
+        <location filename="../base/uninstall.cpp" line="108"/>
         <source>Uninstallation finished</source>
         <translation>完成卸载</translation>
     </message>
@@ -3151,19 +3343,18 @@ HTTP response code: %1</source>
 <context>
     <name>Utils</name>
     <message>
-        <location filename="../base/utils.cpp" line="184"/>
+        <location filename="../base/utils.cpp" line="309"/>
         <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>
+        <location filename="../base/utils.cpp" line="321"/>
+        <source>&lt;li&gt;Target mismatch detected.&lt;br/&gt;Installed target: %1&lt;br/&gt;Selected target: %2.&lt;/li&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/utils.cpp" line="203"/>
+        <location filename="../base/utils.cpp" line="328"/>
         <source>Problem detected:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3171,82 +3362,82 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
 <context>
     <name>VoiceFileCreator</name>
     <message>
-        <location filename="../base/voicefile.cpp" line="41"/>
+        <location filename="../base/voicefile.cpp" line="40"/>
         <source>Starting Voicefile generation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="86"/>
+        <location filename="../base/voicefile.cpp" line="85"/>
         <source>Downloading voice info...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="99"/>
+        <location filename="../base/voicefile.cpp" line="98"/>
         <source>Download error: received HTTP error %1.</source>
         <translation type="unfinished">下载错误: 接到 HTTP 错误 %1. </translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="105"/>
+        <location filename="../base/voicefile.cpp" line="104"/>
         <source>Cached file used.</source>
         <translation type="unfinished">使用缓冲文件.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="108"/>
+        <location filename="../base/voicefile.cpp" line="107"/>
         <source>Download error: %1</source>
         <translation type="unfinished">下载错误: %1</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="113"/>
+        <location filename="../base/voicefile.cpp" line="112"/>
         <source>Download finished.</source>
         <translation type="unfinished">完成下载.</translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="121"/>
+        <location filename="../base/voicefile.cpp" line="120"/>
         <source>failed to open downloaded file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="129"/>
+        <location filename="../base/voicefile.cpp" line="128"/>
         <source>Reading strings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="196"/>
+        <location filename="../base/voicefile.cpp" line="200"/>
         <source>Creating voicefiles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="241"/>
+        <location filename="../base/voicefile.cpp" line="245"/>
         <source>Cleaning up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="252"/>
+        <location filename="../base/voicefile.cpp" line="256"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="173"/>
+        <location filename="../base/voicefile.cpp" line="174"/>
         <source>The downloaded file was empty!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="201"/>
+        <location filename="../base/voicefile.cpp" line="205"/>
         <source>Error opening downloaded file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="212"/>
+        <location filename="../base/voicefile.cpp" line="216"/>
         <source>Error opening output file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="232"/>
+        <location filename="../base/voicefile.cpp" line="236"/>
         <source>successfully created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/voicefile.cpp" line="54"/>
+        <location filename="../base/voicefile.cpp" line="53"/>
         <source>could not find rockbox-info.txt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3254,42 +3445,42 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
 <context>
     <name>ZipInstaller</name>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="59"/>
+        <location filename="../base/zipinstaller.cpp" line="58"/>
         <source>done.</source>
         <translation>完成.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="67"/>
+        <location filename="../base/zipinstaller.cpp" line="66"/>
         <source>Installation finished successfully.</source>
         <translation>成功完成安装.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="80"/>
+        <location filename="../base/zipinstaller.cpp" line="79"/>
         <source>Downloading file %1.%2</source>
         <translation>正在下载文件 %1.%2</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="114"/>
+        <location filename="../base/zipinstaller.cpp" line="113"/>
         <source>Download error: received HTTP error %1.</source>
         <translation>下载错误: 接到 HTTP 错误 %1. </translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="120"/>
+        <location filename="../base/zipinstaller.cpp" line="119"/>
         <source>Cached file used.</source>
         <translation>使用缓冲文件.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="122"/>
+        <location filename="../base/zipinstaller.cpp" line="121"/>
         <source>Download error: %1</source>
         <translation>下载错误: %1</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="126"/>
+        <location filename="../base/zipinstaller.cpp" line="125"/>
         <source>Download finished.</source>
         <translation>完成下载.</translation>
     </message>
     <message>
-        <location filename="../base/zipinstaller.cpp" line="132"/>
+        <location filename="../base/zipinstaller.cpp" line="131"/>
         <source>Extracting file.</source>
         <translation>正在解压文件.</translation>
     </message>
@@ -3322,17 +3513,17 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
 <context>
     <name>ZipUtil</name>
     <message>
-        <location filename="../base/ziputil.cpp" line="97"/>
+        <location filename="../base/ziputil.cpp" line="118"/>
         <source>Creating output path failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ziputil.cpp" line="104"/>
+        <location filename="../base/ziputil.cpp" line="125"/>
         <source>Creating output file failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../base/ziputil.cpp" line="113"/>
+        <location filename="../base/ziputil.cpp" line="134"/>
         <source>Error during Zip operation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3340,32 +3531,37 @@ Installed target: %1, selected target: %2.&lt;/li&gt;</source>
 <context>
     <name>aboutBox</name>
     <message>
-        <location filename="../aboutbox.ui" line="13"/>
+        <location filename="../aboutbox.ui" line="14"/>
         <source>About Rockbox Utility</source>
         <translation>关于Rockbox安装程序</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="35"/>
+        <location filename="../aboutbox.ui" line="32"/>
         <source>The Rockbox Utility</source>
         <translation>Rockbox安装程序</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutbox.ui" line="57"/>
+        <location filename="../aboutbox.ui" line="54"/>
         <source>Installer and housekeeping utility for the Rockbox open source digital audio player firmware.&lt;br/&gt;© 2005 - 2012 The Rockbox Team.&lt;br/&gt;Released under the GNU General Public License v2.&lt;br/&gt;Uses icons by the &lt;a href=&quot;http://tango.freedesktop.org/&quot;&gt;Tango Project&lt;/a&gt;.&lt;br/&gt;&lt;center&gt;&lt;a href=&quot;http://www.rockbox.org&quot;&gt;http://www.rockbox.org&lt;/a&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="77"/>
+        <location filename="../aboutbox.ui" line="74"/>
         <source>&amp;Credits</source>
         <translation>&amp;特别鸣谢</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="109"/>
+        <location filename="../aboutbox.ui" line="106"/>
         <source>&amp;License</source>
         <translation>&amp;授权</translation>
     </message>
     <message>
-        <location filename="../aboutbox.ui" line="151"/>
+        <location filename="../aboutbox.ui" line="132"/>
+        <source>&amp;Speex License</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutbox.ui" line="158"/>
         <source>&amp;Ok</source>
         <translation>&amp;OK</translation>
     </message>