9 files changed, 349 insertions, 132 deletions

diff --git a/i18n/zh_CN/clock.ts b/i18n/zh_CN/clock.ts
index 8fe0d32..6ddbc2c 100644
--- a/i18n/zh_CN/clock.ts
+++ b/i18n/zh_CN/clock.ts
@@ -1,97 +1,209 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Clock</name>
+    <name>AlarmDlg</name>
+    <message>
+        <source>Clock</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>PM</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AlarmDlgBase</name>
     <message>
-        <source>Clock</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stopwatch</source>
+        <source>TextLabel1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snooze</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> mins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Clock</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Alarm</source>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set date and time.</source>
+        <source>Tue</source>
+        <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm Is On</source>
+        <source>Wed</source>
+        <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm Is Off</source>
+        <source>Thu</source>
+        <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Fri</source>
+        <comment>Friday</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <comment>Saturday</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <comment>Sunday</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lap/Split</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Daily Alarm:&lt;/b&gt;&lt;p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daily alarm requires at least
+one day to be selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Alarm set: %1</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
+        <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Set_Alarm</name>
+    <name>ClockBase</name>
+    <message>
+        <source>Clock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stopwatch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Split</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starts and stops the stopwatch.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lap/Split</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resets the stopwatch.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Daily Alarm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check to enable the daily alarm</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set Alarm</source>
+        <source>Set the hour the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hour</source>
+        <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minute</source>
+        <source>Set the minute the alarm will sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mp3 alarm</source>
+        <source>Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Snooze Delay
-(minutes)</source>
+        <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Audio</source>
+        <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Set_Alarm</name>
+</context>
 </TS>
diff --git a/i18n/zh_CN/embeddedkonsole.ts b/i18n/zh_CN/embeddedkonsole.ts
index 48a196e..8658bbc 100644
--- a/i18n/zh_CN/embeddedkonsole.ts
+++ b/i18n/zh_CN/embeddedkonsole.ts
@@ -1,217 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Micro</source>
+        <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small Fixed</source>
+        <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium Fixed</source>
+        <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Command List</source>
+        <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show command list</source>
+        <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hide command list</source>
+        <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
+        <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
+        <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Green on Black</source>
+        <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Black on White</source>
+        <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>White on Black</source>
+        <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
+        <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Black on Red</source>
+        <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Red on Black</source>
+        <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Green on Yellow</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Blue on Magenta</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Magenta on Blue</source>
+        <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cyan on White</source>
+        <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>White on Cyan</source>
+        <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Blue on Black</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amber on Black</source>
+        <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Custom</source>
+        <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font</source>
+        <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
+        <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter</source>
+        <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Space</source>
+        <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab</source>
+        <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Paste</source>
+        <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quick Edit</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Left</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Right</source>
+        <source>Black on Pink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ScrollBar</source>
+        <source>Pink on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wrap</source>
+        <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Beep</source>
+        <source>new session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Command List</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hide Command List</source>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sessions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To exit fullscreen, tap here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History Lines:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Konsole </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/launchersettings.ts b/i18n/zh_CN/launchersettings.ts
index 83e32e0..2ef3cd4 100644
--- a/i18n/zh_CN/launchersettings.ts
+++ b/i18n/zh_CN/launchersettings.ts
@@ -1,186 +1,186 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Applications in subpopups</source>
+        <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check the applets that you want to have included in the O-Menu.</source>
+        <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
+        <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/libaboutapplet.ts b/i18n/zh_CN/libaboutapplet.ts
index 1d478ab..0fdcb94 100644
--- a/i18n/zh_CN/libaboutapplet.ts
+++ b/i18n/zh_CN/libaboutapplet.ts
@@ -1,73 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutDialog</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p&gt;
-&lt;p&gt;
-No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; for more information on the Opie Project.
-&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 &lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
 &lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
+        <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Join</source>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
+&lt;/p&gt;
+&lt;p&gt;
+No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
+&lt;/p&gt;
+&lt;p&gt;
+Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
+&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
+&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; will provide you with what you need.&lt;/p&gt;</source>
+&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
+&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libbatteryapplet.ts b/i18n/zh_CN/libbatteryapplet.ts
index 484dd22..63d7afc 100644
--- a/i18n/zh_CN/libbatteryapplet.ts
+++ b/i18n/zh_CN/libbatteryapplet.ts
@@ -1,97 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ipaq  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libclockapplet.ts b/i18n/zh_CN/libclockapplet.ts
index 4eb9e18..bd02d12 100644
--- a/i18n/zh_CN/libclockapplet.ts
+++ b/i18n/zh_CN/libclockapplet.ts
@@ -1,2 +1,17 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+    <message>
+        <source>Set time...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clock..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libliquid.ts b/i18n/zh_CN/libliquid.ts
index 13fa922..a60e040 100644
--- a/i18n/zh_CN/libliquid.ts
+++ b/i18n/zh_CN/libliquid.ts
@@ -1,9 +1,71 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
+</context>
+<context>
+    <name>LiquidSettings</name>
+    <message>
+        <source>Liquid Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No translucency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stippled, background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stippled, button color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Translucent stippled, background color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Translucent stippled, button color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Custom translucency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use shadowed menu text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Make toolbar buttons appear flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stipple contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>High Performance Liquid style by Mosfet</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libopiecore2.ts b/i18n/zh_CN/libopiecore2.ts
index e2c4c2e..4a4f2b2 100644
--- a/i18n/zh_CN/libopiecore2.ts
+++ b/i18n/zh_CN/libopiecore2.ts
@@ -1,84 +1,88 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Todo Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libopieui2.ts b/i18n/zh_CN/libopieui2.ts
index 04a3f29..cb03c91 100644
--- a/i18n/zh_CN/libopieui2.ts
+++ b/i18n/zh_CN/libopieui2.ts
@@ -1,163 +1,163 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OKeyChooserConfigDialog</name>
+    <name>OTimePickerDialogBase</name>
     <message>
-        <source>Configure Key</source>
+        <source>OTimePickerDialogBase</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
     <message>
-        <source>Pixmap</source>
+        <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
+        <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key</source>
+        <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::Internal::OFileViewFileListView</name>
     <message>
-        <source>Default Key</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Shortcut for Selected Action</source>
+        <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;None</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Default</source>
+        <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>C&amp;ustom</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OKeyChooserConfigDialog</name>
     <message>
         <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Opie::Ui::OKeyConfigWidget</name>
     <message>
-        <source>Default: </source>
+        <source>Pixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key is on BlackList</source>
+        <source>Name</source>
+        <comment>Name of the Action in the ListView Header</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
+        <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key is already assigned</source>
+        <source>Default Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
+        <source>Shortcut for Selected Action</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
     <message>
-        <source>OTimePickerDialogBase</source>
+        <source>&amp;None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time:</source>
+        <source>&amp;Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>:</source>
+        <source>C&amp;ustom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pick Time:</source>
+        <source>Configure Key</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Opie::Ui::OFileSelector</name>
     <message>
-        <source>Name:</source>
+        <source>Default: </source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
     <message>
-        <source>Name</source>
+        <source>Key is on BlackList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>