6 files changed, 151 insertions, 65 deletions

diff --git a/i18n/zh_CN/advancedfm.ts b/i18n/zh_CN/advancedfm.ts
index 0d8a871..070ddfe 100644
--- a/i18n/zh_CN/advancedfm.ts
+++ b/i18n/zh_CN/advancedfm.ts
@@ -85,202 +85,202 @@
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> already exists
-Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> already exists.
+Do you really want to delete it?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/appearance.ts b/i18n/zh_CN/appearance.ts
index a756092..6b7db2b 100644
--- a/i18n/zh_CN/appearance.ts
+++ b/i18n/zh_CN/appearance.ts
@@ -57,124 +57,210 @@
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;new&gt;</source>
+        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
+
+Click here to select an available style.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure the currently selected style.
+
+Note:  This option is not available for all styles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Window decorations control the way the application title bar and its buttons appear.
+
+Click here to select an available decoration.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the desired name, style and size of the default font applications will use.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color schemes are a collection of colors which are used for various parts of the display.
+
+Click here to select an available scheme.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to change the colors in the current color scheme.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to delete the color scheme selected in the list to the left.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to name and save the current color scheme.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to allow all applications to use global appearance settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
+
+This area allows you to select an application and which settings you wish to disable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add an application to the list above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to delete the currently selected application.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the currently selected application up in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the currently selected application down in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
+
+1. Tabs - normal tabs with text labels only
+2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
+3. Drop down list - a vertical listing of tabs
+4. Drop down list w/icons - a vertical listing of tabs with icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here so that tabs appear at the top of the window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here so that tabs appear at the bottom of the window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to select a color for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/qpe.ts b/i18n/zh_CN/qpe.ts
index d5f6e32..87b424d 100644
--- a/i18n/zh_CN/qpe.ts
+++ b/i18n/zh_CN/qpe.ts
@@ -109,136 +109,136 @@ Please charge the back-up battery.</source>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
-        <source>Shut down...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Shutdown...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/sysinfo.ts b/i18n/zh_CN/sysinfo.ts
index 7b498dd..c7d5112 100644
--- a/i18n/zh_CN/sysinfo.ts
+++ b/i18n/zh_CN/sysinfo.ts
@@ -1,290 +1,298 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ModulesDetail</name>
+    <name>ModulesInfo</name>
     <message>
-        <source>Send</source>
+        <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select a command here and then click the Send button to the right to send the command.</source>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This area shows detailed information about this module.</source>
+        <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to send the selected command to this module.</source>
+        <source>Used By</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ModulesInfo</name>
     <message>
-        <source>Module</source>
+        <source>This is a list of all the kernel modules currently loaded on this handheld device.
+
+Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use#</source>
+        <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used By</source>
+        <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is a list of all the kernel modules currently loaded on this handheld device.
-
-Click and hold on a module to see additional information about the module, or to unload it.</source>
+        <source>This area shows detailed information about this module.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ProcessDetail</name>
+    <name>ProcessInfo</name>
     <message>
-        <source>Send</source>
+        <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
+        <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This area shows detailed information about this process.</source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to send the selected signal to this process.</source>
+        <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ProcessInfo</name>
     <message>
-        <source>PID</source>
+        <source>This is a list of all the processes on this handheld device.
+
+Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Command</source>
+        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
+        <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time</source>
+        <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is a list of all the processes on this handheld device.
-
-Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
+        <source>This area shows detailed information about this process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to send
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk /dev/hd </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk /dev/sd </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Int. Storage </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Int. Storage /dev/mtdblock/ </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage /dev/mtdblock </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>CF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>RAM disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
diff --git a/i18n/zh_CN/today.ts b/i18n/zh_CN/today.ts
index 2e69a40..6efe1a8 100644
--- a/i18n/zh_CN/today.ts
+++ b/i18n/zh_CN/today.ts
@@ -17,101 +17,101 @@
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/todolist.ts b/i18n/zh_CN/todolist.ts
index 962b89d..ac79230 100644
--- a/i18n/zh_CN/todolist.ts
+++ b/i18n/zh_CN/todolist.ts
@@ -111,209 +111,201 @@ Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvancedImpl</name>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
-        <source>Form3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>