daily update, this time I also removed the obsolete messages.

Should clean up all the files.

14 files changed, 53 insertions, 171 deletions

diff --git a/i18n/zh_CN/addressbook.ts b/i18n/zh_CN/addressbook.ts
index cbd6585..591e4fe 100644
--- a/i18n/zh_CN/addressbook.ts
+++ b/i18n/zh_CN/addressbook.ts
@@ -677,200 +677,192 @@ Quit anyway?</source>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuait</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Kyrgyztan</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/advancedfm.ts b/i18n/zh_CN/advancedfm.ts
index b456873..25c2ed3 100644
--- a/i18n/zh_CN/advancedfm.ts
+++ b/i18n/zh_CN/advancedfm.ts
@@ -50,196 +50,192 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>command failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</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>Rescan</source>
-        <translation type="obsolete"></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>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</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>
diff --git a/i18n/zh_CN/appearance.ts b/i18n/zh_CN/appearance.ts
index 7c20f02..ec16822 100644
--- a/i18n/zh_CN/appearance.ts
+++ b/i18n/zh_CN/appearance.ts
@@ -1,145 +1,141 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want to delete
 </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>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable background image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</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>
     <message>
-        <source>Apply</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/appskey.ts b/i18n/zh_CN/appskey.ts
index e989899..ece7213 100644
--- a/i18n/zh_CN/appskey.ts
+++ b/i18n/zh_CN/appskey.ts
@@ -1,33 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppsKeyApp</name>
     <message>
         <source>Set Application Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calender</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Address Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Popup Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/buzzword.ts b/i18n/zh_CN/buzzword.ts
index 279ac4e..076f679 100644
--- a/i18n/zh_CN/buzzword.ts
+++ b/i18n/zh_CN/buzzword.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/citytime.ts b/i18n/zh_CN/citytime.ts
index 8438210..62e2ce2 100644
--- a/i18n/zh_CN/citytime.ts
+++ b/i18n/zh_CN/citytime.ts
@@ -1,99 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;location 4&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 6 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 5&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 2&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 6&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 5 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 2 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 1 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 3&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;location 1&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 3 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>&lt;CITY 4 TIME&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/keypebble.ts b/i18n/zh_CN/keypebble.ts
index ab58148..7be0f0f 100644
--- a/i18n/zh_CN/keypebble.ts
+++ b/i18n/zh_CN/keypebble.ts
@@ -6,195 +6,231 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect...</source>
+        <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Disconnect</source>
+        <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop Full Screen</source>
+        <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connected to remote host</source>
+        <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Logged in to remote host</source>
+        <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection closed</source>
+        <source>Open Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KVNCConnectDlg</name>
+    <name>KVNCBookmarkDlgBase</name>
     <message>
-        <source>Connect to VNC server</source>
+        <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
     <message>
-        <source>Host Name:</source>
+        <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Number:</source>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>VncOptionsBase</name>
     <message>
-        <source>VNC Viewer Options</source>
+        <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data Encoding</source>
+        <source>Host Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection</source>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libqpe.ts b/i18n/zh_CN/libqpe.ts
index 495056f..0e681cb 100644
--- a/i18n/zh_CN/libqpe.ts
+++ b/i18n/zh_CN/libqpe.ts
@@ -620,117 +620,113 @@ Free some memory and try again.</source>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</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>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ram FS</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/light-and-power.ts b/i18n/zh_CN/light-and-power.ts
index 5a89b8d..18b2baa 100644
--- a/i18n/zh_CN/light-and-power.ts
+++ b/i18n/zh_CN/light-and-power.ts
@@ -1,57 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LightSettingsBase</name>
     <message>
-        <source>Light Settings</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Adjust to environment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power saving</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bright</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/mail.ts b/i18n/zh_CN/mail.ts
index 8fdd872..d251908 100644
--- a/i18n/zh_CN/mail.ts
+++ b/i18n/zh_CN/mail.ts
@@ -140,196 +140,192 @@
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> of </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attach a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addressbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort sending</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add an Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Attachement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
diff --git a/i18n/zh_CN/showimg.ts b/i18n/zh_CN/showimg.ts
index 17b9a4c..c42e7d7 100644
--- a/i18n/zh_CN/showimg.ts
+++ b/i18n/zh_CN/showimg.ts
@@ -1,155 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading image...</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Could not load image</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No image - select Open from File menu.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1/%2 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, %1 colors</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>, %1 alpha levels</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>, 8-bit alpha channel</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/sound.ts b/i18n/zh_CN/sound.ts
index 492cc73..4a644be 100644
--- a/i18n/zh_CN/sound.ts
+++ b/i18n/zh_CN/sound.ts
@@ -1,117 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
-        <source>Restart</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>To implement a new key switch
-Opie will have to be restarted./n&lt;B&gt;Restart&lt;/B&gt; Opie now?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Shows icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>33075</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Escape</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Calender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
diff --git a/i18n/zh_CN/textedit.ts b/i18n/zh_CN/textedit.ts
index 457b18e..d1341c7 100644
--- a/i18n/zh_CN/textedit.ts
+++ b/i18n/zh_CN/textedit.ts
@@ -36,238 +36,221 @@
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want
-to delete the current file
-from the disk?
-This is irreversable!!</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text Editor has detected
- you selected a .desktop file.
-Open .desktop file or linked file?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt; file.&lt;BR&gt;Open &lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</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>
     <message>
-        <source>filePermissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/today.ts b/i18n/zh_CN/today.ts
index 748913e..097f0fa 100644
--- a/i18n/zh_CN/today.ts
+++ b/i18n/zh_CN/today.ts
@@ -1,121 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No more  today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>