mv dk da

421 files changed, 22176 insertions, 7382 deletions

diff --git a/i18n/da/.cvsignore b/i18n/da/.cvsignore
new file mode 100644
index 0000000..8df47d5
--- a/dev/null
+++ b/i18n/da/.cvsignore
@@ -0,0 +1 @@
+*.qm
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index 591e4fe..ca8580f 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -14,359 +14,413 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arrange Edit Fields</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is not enough space to create
-neccessary startup files.
-
-Free up some space before
-entering data!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mb</source>
+        <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>First Name</source>
+        <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Name</source>
+        <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
+        <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Email</source>
+        <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
+        <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font</source>
+        <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
+        <source>Unable to find a contact for this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Large</source>
+        <source>search pattern !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import vCard</source>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ContactEditor</name>
+    <name>ConfigDlg_Base</name>
     <message>
-        <source>Default Email</source>
+        <source>MyDialog1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emails</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContactEditor</name>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1121,209 +1175,149 @@ Quit anyway?</source>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</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>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Spouse</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>Work Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Mobile</source>
+        <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuwait</source>
+        <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/checkbook.ts b/i18n/en/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/en/checkbook.ts
+++ b/i18n/en/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/citytime.ts b/i18n/en/citytime.ts
index 62e2ce2..a250baf 100644
--- a/i18n/en/citytime.ts
+++ b/i18n/en/citytime.ts
@@ -1,51 +1,67 @@
 <!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>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/embeddedkonsole.ts b/i18n/en/embeddedkonsole.ts
index 5251b68..5699a9c 100644
--- a/i18n/en/embeddedkonsole.ts
+++ b/i18n/en/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</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/en/keypebble.ts b/i18n/en/keypebble.ts
index 7be0f0f..d18d9f6 100644
--- a/i18n/en/keypebble.ts
+++ b/i18n/en/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </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>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/kpacman.ts b/i18n/en/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/en/kpacman.ts
+++ b/i18n/en/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/language.ts b/i18n/en/language.ts
index 6ed8dae..24fd93b 100644
--- a/i18n/en/language.ts
+++ b/i18n/en/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libliquid.ts b/i18n/en/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/en/libliquid.ts
+++ b/i18n/en/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/en/libmetal.ts b/i18n/en/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/en/libmetal.ts
+++ b/i18n/en/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libopie.ts b/i18n/en/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/en/libopie.ts
+++ b/i18n/en/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/en/libqdvorak.ts b/i18n/en/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/en/libqdvorak.ts
+++ b/i18n/en/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libqhandwriting.ts b/i18n/en/libqhandwriting.ts
index e7358b9..20ed59b 100644
--- a/i18n/en/libqhandwriting.ts
+++ b/i18n/en/libqhandwriting.ts
@@ -1,132 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libqjumpx.ts b/i18n/en/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/en/libqjumpx.ts
+++ b/i18n/en/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libqkeyboard.ts b/i18n/en/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/en/libqkeyboard.ts
+++ b/i18n/en/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libqkjumpx.ts b/i18n/en/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/en/libqkjumpx.ts
+++ b/i18n/en/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index 16a917b..4421779 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -51,413 +51,385 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
-        <source>View</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -766,137 +738,153 @@ Free some memory and try again.</source>
     <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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</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>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libqpickboard.ts b/i18n/en/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/en/libqpickboard.ts
+++ b/i18n/en/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libqunikeyboard.ts b/i18n/en/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/en/libqunikeyboard.ts
+++ b/i18n/en/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libtheme.ts b/i18n/en/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/en/libtheme.ts
+++ b/i18n/en/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/light-and-power.ts b/i18n/en/light-and-power.ts
index 18b2baa..0deb0b7 100644
--- a/i18n/en/light-and-power.ts
+++ b/i18n/en/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <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>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>on AC</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>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/mediummount.ts b/i18n/en/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/en/mediummount.ts
+++ b/i18n/en/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/opieplayer.ts b/i18n/en/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/en/opieplayer.ts
+++ b/i18n/en/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/oxygen.ts b/i18n/en/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/en/oxygen.ts
+++ b/i18n/en/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/sheetqt.ts b/i18n/en/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/en/sheetqt.ts
+++ b/i18n/en/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/showimg.ts b/i18n/en/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/en/showimg.ts
+++ b/i18n/en/showimg.ts
@@ -1,123 +1,158 @@
 <!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> True color</source>
         <translation type="unfinished"></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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/sound.ts b/i18n/en/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/en/sound.ts
+++ b/i18n/en/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/systemtime.ts b/i18n/en/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/en/systemtime.ts
+++ b/i18n/en/systemtime.ts
@@ -1,80 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/textedit.ts b/i18n/en/textedit.ts
index 176a7ce..590359f 100644
--- a/i18n/en/textedit.ts
+++ b/i18n/en/textedit.ts
@@ -1,308 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</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>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
-    <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Style</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>About</source>
         <translation type="unfinished"></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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</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>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/en/today.ts b/i18n/en/today.ts
index 3a162ff..63e671c 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -1,166 +1,120 @@
 <!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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index 79e60a4..abfe54e 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -1,217 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>NewTaskDialog</name>
+    <name>MainWindow</name>
     <message>
-        <source>Todo List</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40%</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>NewTaskDialog</name>
+</context>
+<context>
+    <name>NewTaskDialogBase</name>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>Todo</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Show Deadline</source>
+        <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Delete all...</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>all tasks</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 5c05a11..ec0ce45 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -15,404 +15,482 @@
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apellidos</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Correo-e por omisión</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Organizando Campos</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Seleccione el orden de los campos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bajar</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escribir correo a</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Emitir entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mis detalles personales</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Organizar campos</translation>
+        <translation type="obsolete">Organizar campos</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Sin espacio</translation>
+        <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>No hay suficiente espacio para crear
+        <translation type="obsolete">No hay suficiente espacio para crear
 los ficheros iniciales.
 
 ¡Libere algo de espacio antes de
 introducir más datos!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar mis detalles personales</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Dirección</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Mis detalles personales</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Incapaz de guardar la información.
 Libere algo de espacio e
 inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Trabajo</translation>
+        <translation type="obsolete">Trabajo</translation>
     </message>
     <message>
         <source>Mb</source>
-        <translation>MB</translation>
+        <translation type="obsolete">MB</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nombre</translation>
+        <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Apellidos</translation>
+        <translation type="obsolete">Apellidos</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Archivar como</translation>
+        <translation type="obsolete">Archivar como</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Correo-e por omisión</translation>
+        <translation type="obsolete">Correo-e por omisión</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Género</translation>
+        <translation type="obsolete">Género</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar vCard</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar busqueda</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Guardar datos</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Phone Book</source>
         <translation>Agenda telefónica</translation>
     </message>
     <message>
         <source>Company Book</source>
         <translation>Agenda de la empresas</translation>
     </message>
     <message>
         <source>Email Book</source>
         <translation>Agenda de correo-e</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Tarjetas</translation>
     </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation>Correo-e por omisión</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Correos-e</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Compañía</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation>Grupos</translation>
+        <translation type="obsolete">Grupos</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincia</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nombre completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organización</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Cód. postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Gran Bretaña</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japón</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemania</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introducir Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar nombre</translation>
@@ -1170,208 +1248,212 @@ inténtelo de nuevo.
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrania</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Islas Vírgenes</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yugoslavia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax negocio</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax casa</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tfno. negocio</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Teléfono casa</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Móvil negocio</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Móvil personal</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web negocio</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web personal</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Busca negocio</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Calle negocio</translation>
+        <translation type="obsolete">Calle negocio</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Calle casa</translation>
+        <translation type="obsolete">Calle casa</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ciudad trabajo</translation>
+        <translation type="obsolete">Ciudad trabajo</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Provincia trabajo</translation>
+        <translation type="obsolete">Provincia trabajo</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Cód.postal trabajo</translation>
+        <translation type="obsolete">Cód.postal trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>País trabajo</translation>
+        <translation type="obsolete">País trabajo</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ciudad casa</translation>
+        <translation type="obsolete">Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Provincia casa</translation>
+        <translation type="obsolete">Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Cód.postal casa</translation>
+        <translation type="obsolete">Cód.postal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>País casa</translation>
+        <translation type="obsolete">País casa</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Superior</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Cónyuge</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Hijos</translation>
     </message>
     <message>
         <source>Work Phone</source>
-        <translation>Tfno. trabajo</translation>
+        <translation type="obsolete">Tfno. trabajo</translation>
     </message>
     <message>
         <source>Work Fax</source>
-        <translation>Fax trabajo</translation>
+        <translation type="obsolete">Fax trabajo</translation>
     </message>
     <message>
         <source>work Mobile</source>
-        <translation>Móvil trabajo</translation>
+        <translation type="obsolete">Móvil trabajo</translation>
     </message>
     <message>
         <source>Work Pager</source>
-        <translation>Busca trabajo</translation>
+        <translation type="obsolete">Busca trabajo</translation>
     </message>
     <message>
         <source>Work Web Page</source>
-        <translation>Web trabajo</translation>
+        <translation type="obsolete">Web trabajo</translation>
     </message>
     <message>
         <source>Work Mobile</source>
-        <translation>Móvil trabajo</translation>
+        <translation type="obsolete">Móvil trabajo</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation>Kyrgystan</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index ae79dbf..9bf8c06 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -1,332 +1,751 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Checkbook</name>
+    <message>
+        <source>Checkbook</source>
+        <translation type="unfinished">Chequera</translation>
+    </message>
+    <message>
+        <source>New checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transactions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter name of checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished">Tipo:</translation>
+    </message>
+    <message>
+        <source>Select type of checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bank:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter name of the bank for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Account number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter account number for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PIN number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter PIN number for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting balance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the initial balance for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current balance: %10.00</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area shows the current balance in this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add a new transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a transaction and then click here to edit it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here to delete it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the desired chart below and then click on the Draw button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the desired chart type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Account balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Withdrawals by category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deposits by category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to draw the selected chart.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current balance: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete transaction</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Checkbook</source>
+        <translation type="unfinished">Chequera</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all checkbooks currently available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
-        <translation>Detalles transacción</translation>
+        <translation type="obsolete">Detalles transacción</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
-        <translation>Automóvil</translation>
+        <translation type="obsolete">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Facturas</translation>
+        <translation type="obsolete">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDs</translation>
+        <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Ropa</translation>
+        <translation type="obsolete">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Ordenador</translation>
+        <translation type="obsolete">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDs</translation>
+        <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Electrónica</translation>
+        <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Diversión</translation>
+        <translation type="obsolete">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Comida</translation>
+        <translation type="obsolete">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Combustible</translation>
+        <translation type="obsolete">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Varios</translation>
+        <translation type="obsolete">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Películas</translation>
+        <translation type="obsolete">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Alquiler</translation>
+        <translation type="obsolete">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Viaje</translation>
+        <translation type="obsolete">Viaje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation>Cargo a débito</translation>
+        <translation type="obsolete">Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation>Cheque escrito</translation>
+        <translation type="obsolete">Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation>Transferencia</translation>
+        <translation type="obsolete">Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation>Tarjeta crédito</translation>
+        <translation type="obsolete">Tarjeta crédito</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Trabajo</translation>
+        <translation type="obsolete">Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Miembro familiar</translation>
+        <translation type="obsolete">Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Crédito misc</translation>
+        <translation type="obsolete">Crédito misc</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
-        <translation>Pago automático</translation>
+        <translation type="obsolete">Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
-        <translation>Efectivo</translation>
+        <translation type="obsolete">Efectivo</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntryBase</name>
     <message>
         <source>Account Transaction</source>
-        <translation>Transacción contable</translation>
+        <translation type="obsolete">Transacción contable</translation>
     </message>
     <message>
         <source>$</source>
-        <translation>$</translation>
+        <translation type="obsolete">$</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Categoría:</translation>
+        <translation type="obsolete">Categoría:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Descripción:</translation>
+        <translation type="obsolete">Descripción:</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation>Tipo:</translation>
+        <translation type="obsolete">Tipo:</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Cantidad:</translation>
+        <translation type="obsolete">Cantidad:</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Automóvil</translation>
+        <translation type="obsolete">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Facturas</translation>
+        <translation type="obsolete">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDs</translation>
+        <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Ropa</translation>
+        <translation type="obsolete">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Ordenador</translation>
+        <translation type="obsolete">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDs</translation>
+        <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Electrónica</translation>
+        <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Diversión</translation>
+        <translation type="obsolete">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Comida</translation>
+        <translation type="obsolete">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Combustible</translation>
+        <translation type="obsolete">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Varios</translation>
+        <translation type="obsolete">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Películas</translation>
+        <translation type="obsolete">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Alquiler</translation>
+        <translation type="obsolete">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Viaje</translation>
+        <translation type="obsolete">Viaje</translation>
     </message>
     <message>
         <source>Check Number:</source>
-        <translation>Número cheque:</translation>
+        <translation type="obsolete">Número cheque:</translation>
     </message>
     <message>
         <source>Extra Fee:</source>
-        <translation>Cuota extra:</translation>
+        <translation type="obsolete">Cuota extra:</translation>
     </message>
     <message>
         <source>Additional Notes:</source>
-        <translation>Notas adicionales:</translation>
+        <translation type="obsolete">Notas adicionales:</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation>Fecha:</translation>
+        <translation type="obsolete">Fecha:</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation>Cargo a débito</translation>
+        <translation type="obsolete">Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation>Cheque escrito</translation>
+        <translation type="obsolete">Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation>Transferencia</translation>
+        <translation type="obsolete">Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation>Tarjeta crédito</translation>
+        <translation type="obsolete">Tarjeta crédito</translation>
     </message>
     <message>
         <source>Deposit</source>
-        <translation>Depósito</translation>
+        <translation type="obsolete">Depósito</translation>
     </message>
     <message>
         <source>Payment</source>
-        <translation>Pago</translation>
+        <translation type="obsolete">Pago</translation>
     </message>
 </context>
 <context>
     <name>QCheckGraphBase</name>
     <message>
         <source>Account Graph</source>
-        <translation>Gráfico contable</translation>
+        <translation type="obsolete">Gráfico contable</translation>
     </message>
 </context>
 <context>
     <name>QCheckMMBase</name>
     <message>
         <source>Main Menu</source>
-        <translation>Menú principal</translation>
+        <translation type="obsolete">Menú principal</translation>
     </message>
     <message>
         <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
-        <translation>Seleccione una de las chequeras o pulse el icono &quot;Nuevo&quot; de la barra de herramientas.</translation>
+        <translation type="obsolete">Seleccione una de las chequeras o pulse el icono &quot;Nuevo&quot; de la barra de herramientas.</translation>
     </message>
 </context>
 <context>
     <name>QCheckMainMenu</name>
     <message>
         <source>Delete Account</source>
-        <translation>Borrar cuenta</translation>
+        <translation type="obsolete">Borrar cuenta</translation>
     </message>
     <message>
         <source>Really delete the
 </source>
-        <translation>¿Borrar realmente la</translation>
+        <translation type="obsolete">¿Borrar realmente la</translation>
     </message>
     <message>
         <source> account?</source>
-        <translation>cuenta?</translation>
+        <translation type="obsolete">cuenta?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Si</translation>
+        <translation type="obsolete">Si</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>No</translation>
+        <translation type="obsolete">No</translation>
     </message>
     <message>
         <source>Checkbook</source>
-        <translation>Chequera</translation>
+        <translation type="obsolete">Chequera</translation>
     </message>
     <message>
         <source>Could not remove account</source>
-        <translation>No pude borrar la cuenta</translation>
+        <translation type="obsolete">No pude borrar la cuenta</translation>
     </message>
 </context>
 <context>
     <name>QCheckNameBase</name>
     <message>
         <source>Check Book Name</source>
-        <translation>Nombre chequera</translation>
+        <translation type="obsolete">Nombre chequera</translation>
     </message>
     <message>
         <source>Name...</source>
-        <translation>Nombre...</translation>
+        <translation type="obsolete">Nombre...</translation>
     </message>
     <message>
         <source>Please name your check book (limit: 15 characters):</source>
-        <translation>Por favor, nombre su chequera (límite: 15 caracteres):</translation>
+        <translation type="obsolete">Por favor, nombre su chequera (límite: 15 caracteres):</translation>
     </message>
     <message>
         <source>&amp;Done</source>
-        <translation>&amp;Hecho</translation>
+        <translation type="obsolete">&amp;Hecho</translation>
     </message>
 </context>
 <context>
     <name>QCheckViewBase</name>
     <message>
         <source>Account Transactions</source>
-        <translation>Transacciones contables</translation>
+        <translation type="obsolete">Transacciones contables</translation>
     </message>
     <message>
         <source>$0.00</source>
-        <translation>0.00€</translation>
+        <translation type="obsolete">0.00€</translation>
     </message>
     <message>
         <source>Balance:</source>
-        <translation>Balance:</translation>
+        <translation type="obsolete">Balance:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
-        <translation>Sin espacio</translation>
+        <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
-        <translation>Hubo un problema creando
+        <translation type="obsolete">Hubo un problema creando
 la información de configuración
 para este programa.
 
 Por favor, libere algo de espacio
 e inténtelo de nuevo.</translation>
     </message>
 </context>
+<context>
+    <name>Transaction</name>
+    <message>
+        <source>Transaction for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Withdrawal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deposit</source>
+        <translation type="unfinished">Depósito</translation>
+    </message>
+    <message>
+        <source>Date:</source>
+        <translation type="unfinished">Fecha:</translation>
+    </message>
+    <message>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter check number here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished">Descripción:</translation>
+    </message>
+    <message>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished">Categoría:</translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished">Tipo:</translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished">Cantidad:</translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Automóvil</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Facturas</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CDs</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Ropa</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Ordenador</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVDs</translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished">Electrónica</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Diversión</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Comida</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Combustible</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Varios</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Películas</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Alquiler</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Viaje</translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished">Cargo a débito</translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished">Cheque escrito</translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished">Transferencia</translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished">Tarjeta crédito</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Trabajo</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Miembro familiar</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Crédito misc</translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished">Pago automático</translation>
+    </message>
+    <message>
+        <source>Cash</source>
+        <translation type="unfinished">Efectivo</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/embeddedkonsole.ts b/i18n/es/embeddedkonsole.ts
index a411aee..e4d7416 100644
--- a/i18n/es/embeddedkonsole.ts
+++ b/i18n/es/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation>Verde sobre negro</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Negro sobre blanco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanco sobre negro</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Blanco sobre transparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Negro sobre rojo</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rojo sobre negro</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde sobre amarillo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul sobre magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sobre azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cian sobre blanco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanco sobre cian</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul sobre negro</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ámbar sobre negro</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Editar rápido</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra desp</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista comandos</translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Añadir comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a añadir:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/keypebble.ts b/i18n/es/keypebble.ts
index e6ac2b6..3c597e5 100644
--- a/i18n/es/keypebble.ts
+++ b/i18n/es/keypebble.ts
@@ -52,189 +52,233 @@ se desconectó.</translation>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Esperando versión del servidor...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Error: Versión del servidor no válida, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Error: Versión del servidor no contemplada,%1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Sesión iniciada</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Error: Este servidor requiere clave y no se ha especificado.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Error: La clave especificada era incorrecta.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Error: Demasiados intentos fallidos.
 Por favor, inténtelo más tarde.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Indentificación fallida</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Demasiados fallos</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Visor VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Pantalla normal</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Conectado a máquina remota</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Identificado en máquina remota</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexión cerrada</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Abrir marcador</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Borrar marcador</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Enviar Ctrl+Alt+Borrar</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>Conexión Visor VNC</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Mostar contraseña</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Nombre marcador:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Nombre máquina:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Número pantalla:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Comprobar pantalla cada:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Milisegundos</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Solicitar sesión 8 bits</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Modo escucha</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Solicitar sesión compartida</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Factor de escala</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Codificaciones</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Codificación Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>Codificación CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>Codificación RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Codificación copiar rectángulo</translation>
     </message>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/kpacman.ts b/i18n/es/kpacman.ts
index c10870e..ca86d29 100644
--- a/i18n/es/kpacman.ts
+++ b/i18n/es/kpacman.ts
@@ -139,149 +139,149 @@ o está en un formato desconocido.</translation>
     <message>
         <source>CHARACTER</source>
         <translation>CARACTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>APODO</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SOMBRA</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;INTERMITENTE&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-RÁPIDO</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;MEÑIQUE&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-VERGONZOSO</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;TINTADO&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PULSE CURSOR PARA EMPEZAR</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>PUTUACIÓN MAX</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    ENHORABUENA      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   HA CONSEGUIDO    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation> UNA BUENA PUNTUACIÓN.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>CLAS   PUNTOS NOMBRE FECHA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>You&apos;re going to create the highscore-file
 &apos;%1&apos;
 for your maschine, that should be used systemwide.
 
 To grant access to the other users, set the appropriate rights (a+w)
 on that file or ask your systemadministator for that favor.
 
 To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation>Va a generar el archivo de puntuaciones
+        <translation type="obsolete">Va a generar el archivo de puntuaciones
 &apos;%1&apos;
 para su máquina, que debería usarse por todo el sistema.
 
 Para permitir el acceso a otros usuarios, ponga los permisos apropiados (a+w)
 en ese archivo o pida a su administrador que lo haga.
 
 Para usar un directorio o archivo diferente para las puntuaciones, especifíquelo en el archivo de configuración (kpacmanrc:highscoreFilePath).</translation>
     </message>
     <message>
         <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
 missing write-access to the systemwide file
 &apos;%1&apos; .
 
 Ask your systemadministrator for granting you access to that file,
 by setting the appropriate rights (a+w) on it.
 
 To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation>Esta usando un archivo de puntuación privado, lo que suele ocurrir
+        <translation type="obsolete">Esta usando un archivo de puntuación privado, lo que suele ocurrir
 porque no tiene permiso de escritura en el archivo de puntuación global.
 
 Pida a su administrador de sistema que le dé acceso a ese archivo,
 fijando los permisos adecuados (a+w).
 
 Para usar un directorio o archivo diferente para las puntuaciones, especifíquelo en el archivo de configuración (kpacmanrc:highscoreFilePath).</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source>                          </source>
-        <translation>                          </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>La fuente de bits no pudo construirse.
 
 El fichero &apos;@PIXMAPNAME@&apos; no existe,
 o está en un formato desconocido.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Error al iniciar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/language.ts b/i18n/es/language.ts
index 2976dc4..7146a4c 100644
--- a/i18n/es/language.ts
+++ b/i18n/es/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Seleccione idioma</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index 473753e..56c7a93 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -1,85 +1,85 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation>Estilo Líquido</translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation>Sin transparencias</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation>Punteado, color de fondo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation>Punteado, color de botón</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation>Punteado translúcido, color de fondo</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation>Punteado translúcido, color de botón</translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation>Transparencia propia</translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation>Color del menú</translation>
     </message>
     <message>
         <source>Text color</source>
         <translation>Color del texto</translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation>Opacidad</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation>Usar texto del menú sombreado</translation>
     </message>
     <message>
         <source>Draw liquid window title bars</source>
-        <translation>Barra título ventana líquida</translation>
+        <translation type="obsolete">Barra título ventana líquida</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
         <translation>Botones planos en barra herramientas</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation>Puntear contraste</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Liquid</source>
         <comment>name</comment>
-        <translation>Líquido</translation>
+        <translation type="obsolete">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <comment>description</comment>
-        <translation>Estilo Líquido de alto rendimiento por Mosfet</translation>
+        <translation type="obsolete">Estilo Líquido de alto rendimiento por Mosfet</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation>Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation>Estilo Líquido de alto rendimiento por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libmetal.ts b/i18n/es/libmetal.ts
index 609fd8e..56ea795 100644
--- a/i18n/es/libmetal.ts
+++ b/i18n/es/libmetal.ts
@@ -1,22 +1,22 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Metal</source>
         <comment>name</comment>
-        <translation>Metal</translation>
+        <translation type="obsolete">Metal</translation>
     </message>
     <message>
         <source>Metal style</source>
         <comment>description</comment>
-        <translation>Estilo Metálico</translation>
+        <translation type="obsolete">Estilo Metálico</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation>Metal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index 096023a..06a0fbe 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -1,472 +1,563 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
     <message>
         <source>More</source>
-        <translation>Más</translation>
+        <translation type="obsolete">Más</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Más...</translation>
+        <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
-        <translation>Tono:</translation>
+        <translation type="obsolete">Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
-        <translation>Sat:</translation>
+        <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation>Val:</translation>
+        <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation>Rojo:</translation>
+        <translation type="obsolete">Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation>Verde:</translation>
+        <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation>Azul:</translation>
+        <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation>Canal alpha:</translation>
+        <translation type="obsolete">Canal alpha:</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation>Seleccionar color</translation>
+        <translation type="obsolete">Seleccionar color</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>DiálogoFichero</translation>
+        <translation type="obsolete">DiálogoFichero</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Abrir</translation>
+        <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Salvar</translation>
+        <translation type="obsolete">Salvar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
-        <translation>Documentos</translation>
+        <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation>Ficheros</translation>
+        <translation type="obsolete">Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation>Todos ficheros</translation>
+        <translation type="obsolete">Todos ficheros</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Todo</translation>
+        <translation type="obsolete">Todo</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nombre:</translation>
+        <translation type="obsolete">Nombre:</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Salvar</translation>
+        <translation type="obsolete">&amp;Salvar</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
-        <translation>&amp;Cancelar</translation>
+        <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nombre</translation>
+        <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamaño</translation>
+        <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Fecha</translation>
+        <translation type="obsolete">Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation>Tipo mime</translation>
+        <translation type="obsolete">Tipo mime</translation>
     </message>
     <message>
         <source>Ser Permission</source>
-        <translation>Fijar permisos</translation>
+        <translation type="obsolete">Fijar permisos</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Borrar</translation>
+        <translation type="obsolete">Borrar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Seguro que quiere borrar
+        <translation type="obsolete">Seguro que quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sí</translation>
+        <translation type="obsolete">Sí</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>No</translation>
+        <translation type="obsolete">No</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation>Grande</translation>
+        <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Mediano</translation>
+        <translation type="obsolete">Mediano</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation>Pequeño</translation>
+        <translation type="obsolete">Pequeño</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamaño</translation>
+        <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>El Rápido Zorro Marrón Saltó Por Encima Del Perro Perezoso</translation>
+        <translation type="obsolete">El Rápido Zorro Marrón Saltó Por Encima Del Perro Perezoso</translation>
+    </message>
+</context>
+<context>
+    <name>ORecurranceBase</name>
+    <message>
+        <source>Repeating Event </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End On:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation>Tomar Hora</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
-        <translation>Sumario:</translation>
+        <translation type="obsolete">Sumario:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Descripción:</translation>
+        <translation type="obsolete">Descripción:</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Prioridad:</translation>
+        <translation type="obsolete">Prioridad:</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Progreso:</translation>
+        <translation type="obsolete">Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation>Fecha tope:</translation>
+        <translation type="obsolete">Fecha tope:</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Categoría:</translation>
+        <translation type="obsolete">Categoría:</translation>
     </message>
     <message>
         <source>Alarmed Notification:</source>
-        <translation>Notificación de alarma:</translation>
+        <translation type="obsolete">Notificación de alarma:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
-        <translation>Correo-e: </translation>
+        <translation type="obsolete">Correo-e: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
-        <translation>Teléfono casa: </translation>
+        <translation type="obsolete">Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation>Fax casa: </translation>
+        <translation type="obsolete">Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
-        <translation>Móvil personal: </translation>
+        <translation type="obsolete">Móvil personal: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation>Web personal: </translation>
+        <translation type="obsolete">Web personal: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation>Web negocio: </translation>
+        <translation type="obsolete">Web negocio: </translation>
     </message>
     <message>
         <source>Office: </source>
-        <translation>Oficina: </translation>
+        <translation type="obsolete">Oficina: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation>Teléfono negocio: </translation>
+        <translation type="obsolete">Teléfono negocio: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation>Fax negocio: </translation>
+        <translation type="obsolete">Fax negocio: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation>Móvil negocio: </translation>
+        <translation type="obsolete">Móvil negocio: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation>Busca negocio: </translation>
+        <translation type="obsolete">Busca negocio: </translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation>Profesión: </translation>
+        <translation type="obsolete">Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation>Ayudante: </translation>
+        <translation type="obsolete">Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation>Superior: </translation>
+        <translation type="obsolete">Superior: </translation>
     </message>
     <message>
         <source>Male</source>
-        <translation>Hombre</translation>
+        <translation type="obsolete">Hombre</translation>
     </message>
     <message>
         <source>Female</source>
-        <translation>Mujer</translation>
+        <translation type="obsolete">Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
-        <translation>Género: </translation>
+        <translation type="obsolete">Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
-        <translation>Cónyuge: </translation>
+        <translation type="obsolete">Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
-        <translation>Cumpleaños: </translation>
+        <translation type="obsolete">Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
-        <translation>Aniversario: </translation>
+        <translation type="obsolete">Aniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
-        <translation>Apodo: </translation>
+        <translation type="obsolete">Apodo: </translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nombre</translation>
+        <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>1º apellido</translation>
+        <translation type="obsolete">1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>2º apellido</translation>
+        <translation type="obsolete">2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Sufijo</translation>
+        <translation type="obsolete">Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Guardar como</translation>
+        <translation type="obsolete">Guardar como</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Cargo</translation>
+        <translation type="obsolete">Cargo</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Departamento</translation>
+        <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Compañía</translation>
+        <translation type="obsolete">Compañía</translation>
     </message>
     <message>
         <source>Business Phone</source>
-        <translation>Teléfono negocio</translation>
+        <translation type="obsolete">Teléfono negocio</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax negocio</translation>
+        <translation type="obsolete">Fax negocio</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Móvil negocio</translation>
+        <translation type="obsolete">Móvil negocio</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Correo-e preferido</translation>
+        <translation type="obsolete">Correo-e preferido</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Correos-e</translation>
+        <translation type="obsolete">Correos-e</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Teléfono casa</translation>
+        <translation type="obsolete">Teléfono casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax casa</translation>
+        <translation type="obsolete">Fax casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Móvil casa</translation>
+        <translation type="obsolete">Móvil casa</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Calle negocio</translation>
+        <translation type="obsolete">Calle negocio</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ciudad negocio</translation>
+        <translation type="obsolete">Ciudad negocio</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Provincia negocio</translation>
+        <translation type="obsolete">Provincia negocio</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Cód.postal negocio</translation>
+        <translation type="obsolete">Cód.postal negocio</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>País negocio</translation>
+        <translation type="obsolete">País negocio</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Busca negocio</translation>
+        <translation type="obsolete">Busca negocio</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Web negocio</translation>
+        <translation type="obsolete">Web negocio</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Oficina</translation>
+        <translation type="obsolete">Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Profesión</translation>
+        <translation type="obsolete">Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Ayudante</translation>
+        <translation type="obsolete">Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Superior</translation>
+        <translation type="obsolete">Superior</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Calle casa</translation>
+        <translation type="obsolete">Calle casa</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ciudad casa</translation>
+        <translation type="obsolete">Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Provincia casa</translation>
+        <translation type="obsolete">Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Cód.postal casa</translation>
+        <translation type="obsolete">Cód.postal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>País casa</translation>
+        <translation type="obsolete">País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Web personal</translation>
+        <translation type="obsolete">Web personal</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Cónyuge</translation>
+        <translation type="obsolete">Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Género</translation>
+        <translation type="obsolete">Género</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Cumpleaños</translation>
+        <translation type="obsolete">Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Aniversario</translation>
+        <translation type="obsolete">Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Apodo</translation>
+        <translation type="obsolete">Apodo</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Hijos</translation>
+        <translation type="obsolete">Hijos</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation>Grupos</translation>
+        <translation type="obsolete">Grupos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libqdvorak.ts b/i18n/es/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/es/libqdvorak.ts
+++ b/i18n/es/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libqhandwriting.ts b/i18n/es/libqhandwriting.ts
index 01f92cd..b1ae502 100644
--- a/i18n/es/libqhandwriting.ts
+++ b/i18n/es/libqhandwriting.ts
@@ -1,136 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>Ayuda Escritura Manual</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;Cuando empiece a usar reconocimiento de escritura manual escriba despacio, preciso y firme.&lt;li&gt;Use las líneas guía cuando esciba los caracteres.&lt;li&gt;Cuando escriba un caracter de varios trazos, cada trazo sucesivo debe ser dibujado antes de que el anterior, en gris, desaparezca.&lt;li&gt;Practique con el entrenador de escritura manual.&lt;li&gt;Cuando añada plantillas con sus propios caracteres asegúrese que son lo suficientemente diferentes de las otras.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Sugerencias</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Entrenador</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation>Seleccione un caracter de la lista. El área de escritura de la izquierda muestra el caracter refencia. Practique la escitura en el área de la derecha.</translation>
+        <translation type="obsolete">Seleccione un caracter de la lista. El área de escritura de la izquierda muestra el caracter refencia. Practique la escitura en el área de la derecha.</translation>
     </message>
     <message>
         <source>Matched: </source>
         <translation>Coincidencia:</translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Similar a:</translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Nuevo...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinido</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Introduzca nuevo caracter</translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation>Impreso1</translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation>Espera en caracteres multitrazo:</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>Áreas de entrada mostradas</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>Áreas de mayúsculas y minúsculas</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>Minúsculas (conmutar mayúsculas)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Configurar Escritura Manual</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Perfil caracter:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Incapaz de salvar información.
 Libere algo de espacio
 e inténtelo de nuevo.
 
 ¿Salir aún así?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libqjumpx.ts b/i18n/es/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/es/libqjumpx.ts
+++ b/i18n/es/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libqkeyboard.ts b/i18n/es/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/es/libqkeyboard.ts
+++ b/i18n/es/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libqkjumpx.ts b/i18n/es/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/es/libqkjumpx.ts
+++ b/i18n/es/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 753f75c..37862e6 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -53,412 +53,416 @@
     <message>
         <source>Categories</source>
         <translation>Categorías</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicación</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Aquí van las categorías</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Verificar las categorías a las que pertenece este documento.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Introduzca una nueva categoría aquí. Pulse &lt;b&gt;Añadir&lt;/b&gt; para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Introduzca una nueva categoría a la izquierda y pulse para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pulse para borrar la categoría resaltada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Verificar que esta propiedad está disponible en todas las aplicaciones.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Lo siento, otra aplicación está
 editando las categorías.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar categorías</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostar Enero del año seleccionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostar el mes anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostar el mes siguiente</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostar Diciembre del año seleccionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>View</source>
-        <translation>Ver</translation>
+        <translation type="obsolete">Ver</translation>
     </message>
     <message>
         <source>Create a new Document</source>
-        <translation>Crear nuevo documento</translation>
+        <translation type="obsolete">Crear nuevo documento</translation>
     </message>
     <message>
         <source>Close the File Selector</source>
         <translation>Cerrar selección fichero</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostar documentos de este tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostar documentos de esta categoría</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Pulse para seleccionar un documento de la lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, o selecione &lt;b&gt;Nuevo dcumento&lt;/b&gt; para crearlo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Mantenga pulsado para las propiedades del documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>There are no files in this directory.</source>
-        <translation>No hay ficheros en este directorio.</translation>
+        <translation type="obsolete">No hay ficheros en este directorio.</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Cadena no encontrada.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Final alcanzado, empezando por el principio</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Qué buscar:</translation>
     </message>
     <message>
         <source>&amp;Find</source>
-        <translation>&amp;Buscar</translation>
+        <translation type="obsolete">&amp;Buscar</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Iniciar búsqueda el:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dic 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Buscar hacia atrás</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Falló al borrar fichero.</translation>
     </message>
     <message>
         <source>Delete Icon and leave file</source>
-        <translation>Borrar icono y dejar fichero</translation>
+        <translation type="obsolete">Borrar icono y dejar fichero</translation>
     </message>
     <message>
         <source>Icon deletion failed.</source>
-        <translation>Fallo al borrar icono.</translation>
+        <translation type="obsolete">Fallo al borrar icono.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copiar de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fallo al copiar fichero.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Fallo al mover documento.</translation>
     </message>
     <message>
         <source>File does not exist.</source>
-        <translation>El fichero no existe.</translation>
+        <translation type="obsolete">El fichero no existe.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentario:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localización:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carga rápida (consume memoria)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Del Icon</source>
-        <translation>Borrar icono</translation>
+        <translation type="obsolete">Borrar icono</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>El medio en el que reside el documento.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>El nombre de este documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Precargar esta aplicación para disponibilidad instantánea.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Borrar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Hacer una copia de este documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emitir este documento a otro dispositivo.</translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Información del propietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</source>
         <translation>Impreso1</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introduzca código</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Hubo un problema creando
 la información de configuración
 de este programa.
 
 Por favor, libere espacio e
 inténtelo de nuevo.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Incapaz de crear ficheros de inicio.
 Por favor, libere espacio antes
 de introducir datos</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e intételo de nuevo.</translation>
@@ -776,138 +780,154 @@ Libere memoria e intételo de nuevo.</translation>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Hijos</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuevo documento</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qué es esto...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Pulse para cerrar esta ventana, descartando los cambios.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Pulse para cerrar esta ventana.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Pulse para cerrar esta ventana y aplicar los cambios.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Pulse para hacer esta ventana móvil.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Tarjeta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Tarjeta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco duro SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Almacenamiento interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria interna</translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e inténtelo de nuevo</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos los %1 ficheros</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos los ficheros</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpickboard.ts b/i18n/es/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/es/libqpickboard.ts
+++ b/i18n/es/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libqunikeyboard.ts b/i18n/es/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/es/libqunikeyboard.ts
+++ b/i18n/es/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libtheme.ts b/i18n/es/libtheme.ts
index 4bfe5a2..25c63df 100644
--- a/i18n/es/libtheme.ts
+++ b/i18n/es/libtheme.ts
@@ -1,49 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Themed style</source>
         <comment>name</comment>
-        <translation>Estilo del tema</translation>
+        <translation type="obsolete">Estilo del tema</translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <comment>description</comment>
-        <translation>Motor de estilos compatible con temas KDE2</translation>
+        <translation type="obsolete">Motor de estilos compatible con temas KDE2</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation>Estilo del tema</translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation>Motor de estilos compatible con temas KDE2</translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation>Estilo del Tema</translation>
     </message>
     <message>
         <source>Select the theme to be used</source>
         <translation>Seleccione el tema que usará</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>[No theme]</source>
         <translation>[Sin tema]</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/light-and-power.ts b/i18n/es/light-and-power.ts
index 9c41e73..c16d2ca 100644
--- a/i18n/es/light-and-power.ts
+++ b/i18n/es/light-and-power.ts
@@ -1,53 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Calibration</name>
+    <message>
+        <source>%1 Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Adjust to environment</source>
-        <translation>Ajustar a entorno</translation>
+        <translation type="obsolete">Ajustar a entorno</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>Un sensor de luz ambiental ajusta automáticamente la iluminación de la pantalla. La configuración del brillo aún afecta el brillo medio.</translation>
     </message>
     <message>
         <source>Power saving</source>
-        <translation>Ahorro de energía</translation>
+        <translation type="obsolete">Ahorro de energía</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation> segundos</translation>
+        <translation type="obsolete"> segundos</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Bajar luz tras</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender tras</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
-        <translation>Sólo desactivar la pantalla al suspender</translation>
+        <translation type="obsolete">Sólo desactivar la pantalla al suspender</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Sin luz tras</translation>
     </message>
     <message>
         <source>Bright</source>
-        <translation>Brillante</translation>
+        <translation type="obsolete">Brillante</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
-        <translation>&lt;blockquote&gt;Cuanto mas brillante es la luz de la pantalla, más batería se consume.&lt;/blockquote&gt;</translation>
+        <translation type="obsolete">&lt;blockquote&gt;Cuanto mas brillante es la luz de la pantalla, más batería se consume.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Apagada</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation>Configuración de Luz y Energía</translation>
     </message>
+    <message>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished">Apagada</translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/mediummount.ts b/i18n/es/mediummount.ts
index f86eb5e..ff7b43b 100644
--- a/i18n/es/mediummount.ts
+++ b/i18n/es/mediummount.ts
@@ -1,87 +1,91 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation>Si un medio es insertado en el dispositivo Opie intenta buscar el medio para Documentos. En medios grandes esto puede llevar tiempo. Puede escoger si Opie debe examinar para Documentos globalmente, o por medio. También puede reconfigurar cada medio.</translation>
+        <translation type="obsolete">Si un medio es insertado en el dispositivo Opie intenta buscar el medio para Documentos. En medios grandes esto puede llevar tiempo. Puede escoger si Opie debe examinar para Documentos globalmente, o por medio. También puede reconfigurar cada medio.</translation>
     </message>
     <message>
         <source>Enable medium checking</source>
         <translation>Habilitar comprobación medio</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Usar configuración global</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros de medio</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros de medio</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limitar búsqueda a:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Comprobar siempre este medio</translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/opieplayer.ts b/i18n/es/opieplayer.ts
index eab73b6..fb4a806 100644
--- a/i18n/es/opieplayer.ts
+++ b/i18n/es/opieplayer.ts
@@ -1,272 +1,280 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation>Algo falla en el
 dispositivo sonido.
 open(&quot;/dev/dsp&quot;)
 </translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation>
 
 Cerrando reproductor.</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Reproductor Opie</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation>Sin fichero</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation>Error: ningún fichero seleccionado</translation>
     </message>
     <message>
         <source>File not found</source>
         <translation>Fichero no encontrado</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation>El siguiente fichero no fue encotrado: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation>No encotré decodificador</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation>Perdón, no encontré decodificadores apropiados para este fichero: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation>Error abriendo fichero</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation>Perdón, ocurrió un error intentando abrir el fichero: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
         <translation>Fichero: </translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>, Longitud: </translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>Selección lista</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Reproductor Opie</translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation>Operaciones reproducción</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation>Añadir a la lista</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation>Borrar de la lista</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>Barajar</translation>
     </message>
     <message>
         <source>Loop</source>
         <translation>Bucle</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation>Limpiar lista</translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation>Añadir todos los audio</translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation>Añadir todos los vídeos</translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation>Añadir todos</translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation>Guardar lista</translation>
     </message>
     <message>
         <source>Export playlist to m3u</source>
-        <translation>Exportar lista a m3u</translation>
+        <translation type="obsolete">Exportar lista a m3u</translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation>Abrir fichero o URL</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation>Releer ficheros audio</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation>Releer ficheros video</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Scale</source>
         <translation>Escala</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Bajar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>Listas</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>Reproductor Opie: </translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation>Hubo un problema guardando la lista.
 Su lista puede haber perdido alguna entrada
 la próxima vez que la inicie.</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>Fichero no válido</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>Hubo un problema trayendo el fichero.</translation>
     </message>
     <message>
         <source>Save Playlist</source>
-        <translation>Guardar lista</translation>
+        <translation type="obsolete">Guardar lista</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation>¿Borrar lista?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>¿Seguro que quiere
 borrar esta lista?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>Reproducir seleccionados</translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation>Abrir fichero o URL</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation>Guardar lista m3u</translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Reproductor Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/oxygen.ts b/i18n/es/oxygen.ts
index ea21748..9c463d2 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -1,130 +1,130 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculations</source>
-        <translation>Cálculos</translation>
+        <translation type="obsolete">Cálculos</translation>
     </message>
     <message>
         <source>Molweight</source>
-        <translation>Peso molecular</translation>
+        <translation type="obsolete">Peso molecular</translation>
     </message>
     <message>
         <source>Formula:</source>
-        <translation>Fórmula:</translation>
+        <translation type="obsolete">Fórmula:</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Calcular</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Result:</source>
-        <translation>Resultado:</translation>
+        <translation type="obsolete">Resultado:</translation>
     </message>
     <message>
         <source>Elemental composition (%):</source>
-        <translation>Composición elemental (%):</translation>
+        <translation type="obsolete">Composición elemental (%):</translation>
     </message>
     <message>
         <source>Nernst</source>
-        <translation>Nernst</translation>
+        <translation type="obsolete">Nernst</translation>
     </message>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso molecular</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Fórmula química</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso molecular (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composición elemental (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Bloque</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electronegatividad</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Radio atómico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energía ionización</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densidad</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Punto ebullición</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Punto fusión</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation>%1 nm</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
 </context>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index 76fe914..c964096 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,276 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Ver como lista</translation>
     </message>
 </context>
 <context>
     <name>Desktop</name>
     <message>
         <source>Battery Status</source>
-        <translation>Estado de la batería</translation>
+        <translation type="obsolete">Estado de la batería</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!&quot;nKeep power off until power restored!</source>
-        <translation>¡El nivel de la batería es crítico!&quot;n¡Apágueme o enchúfeme!</translation>
+        <translation type="obsolete">¡El nivel de la batería es crítico!&quot;n¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>La batería está muy baja.</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>tarjeta de visita</translation>
     </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Estado de la Batería</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Ver como documentos</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Medio insertado</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media file?</source>
-        <translation>Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
+        <translation type="obsolete">Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Enlace a aplicaciones</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Limitar búsqueda al directorio: (no se usa aún)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>Su decisión será guardada en el medio.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sí</translation>
+        <translation type="obsolete">Sí</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>No</translation>
+        <translation type="obsolete">No</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shut down...</source>
         <translation>Apagar...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="obsolete">&lt;p&gt;
 Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Conexión de sincronización</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you ae using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
+        <translation type="obsolete">&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Denegar</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you hve just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
+        <translation type="obsolete">&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Permitir</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation>&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sheetqt.ts b/i18n/es/sheetqt.ts
index b87d88c..4203105 100644
--- a/i18n/es/sheetqt.ts
+++ b/i18n/es/sheetqt.ts
@@ -586,193 +586,193 @@
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation>Arco tan&amp;gente</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation>Arco tangente de coordenadas</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation>Arco tangente co&amp;or</translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation>Exponencial</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation>&amp;Exponencial</translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation>Logaritmo</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation>&amp;Logaritmo</translation>
     </message>
     <message>
         <source>Power</source>
         <translation>Potencia</translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation>&amp;Potencia</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation>&amp;Matemática</translation>
     </message>
     <message>
         <source>Average</source>
         <translation>Media</translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation>Medi&amp;a</translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation>Máximo</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation>Má&amp;ximo</translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation>Mínimo</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation>&amp;Mínimo</translation>
     </message>
     <message>
         <source>Count</source>
         <translation>Contador</translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation>&amp;Contador</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation>E&amp;stadístico</translation>
     </message>
     <message>
         <source>Functions</source>
         <translation>Funciones</translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation>¡No encontré la ayuda!</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.1
 Release Date: July 04, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
-        <translation>Opie Sheet
+        <translation type="obsolete">Opie Sheet
 Hoja de Cálculo de Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Desarrollado por: Serdar Ozler
 Versión 1.0.1
 Fecha: 04 julio 2002
 
 Este producto está bajo licencia GPL. Es de libre distribución. Si quiere la última versión y el código fuente, por favor visite el sitio web.
 
 http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
         <translation>&amp;Número de filas:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>&amp;Número de columnas:</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation>&amp;Número de hojas:</translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation>Hoja</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation>&amp;Altura de cada fila:</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation>A&amp;nchura de cada columna:</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation>&amp;Nombre hoja:</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation>¡Sólo hay una hoja!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>¿Está seguro?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>&amp;Tipo</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation>Mover cel&amp;dillas abajo</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation>Move&amp;r celdillas derecha</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation>Toda la &amp;fila</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation>Toda la &amp;columna</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
         <translation>Opie Sheet
 Hoja de cálculo para Opie
 QWDC Beta Winner (como Sheet/Qt)
 
 Desarrollado por: Serdar Ozler
 Versión 1.0.2
 Fecha: 08 de octubre de 2002
 </translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
diff --git a/i18n/es/showimg.ts b/i18n/es/showimg.ts
index a0a4eed..7d05ed8 100644
--- a/i18n/es/showimg.ts
+++ b/i18n/es/showimg.ts
@@ -1,123 +1,166 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Brillo</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Visor de Imágenes</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Espejo horizontal</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Espejo vertical</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rotar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rotar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Visor de imágenes</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Color verdadero</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Ver miniaturas</translation>
     </message>
     <message>
         <source>Slideshow</source>
-        <translation>Diapositivas</translation>
+        <translation type="obsolete">Diapositivas</translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation>Preferencias..</translation>
     </message>
     <message>
         <source>Help</source>
-        <translation>Ayuda</translation>
+        <translation type="obsolete">Ayuda</translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation>Info imagen ...</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Abrir ...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>Rotar 270º</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Brillo ...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Blanco y negro</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>Ajustar a la pantalla</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 colores</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 niveles alpha</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>canal alpha de 8 bits</translation>
     </message>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/sound.ts b/i18n/es/sound.ts
index 0879991..8f728f1 100644
--- a/i18n/es/sound.ts
+++ b/i18n/es/sound.ts
@@ -1,132 +1,132 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
         <source>Shows icon</source>
         <translation>Mostrar icono</translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation>Ocultar icono</translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>Vmemo Settings</source>
         <translation>Configuración de Vmemo</translation>
     </message>
     <message>
         <source>8000</source>
         <translation>8000</translation>
     </message>
     <message>
         <source>11025</source>
         <translation>11025</translation>
     </message>
     <message>
         <source>22050</source>
         <translation>22050</translation>
     </message>
     <message>
         <source>33075</source>
         <translation>33075</translation>
     </message>
     <message>
         <source>44100</source>
         <translation>44100</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Estéreo</translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation>16 bit</translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation>Alertas visuales</translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
         <translation>Icono Barra Tareas</translation>
     </message>
     <message>
         <source>Key_Escape</source>
-        <translation>Tecla_Escape</translation>
+        <translation type="obsolete">Tecla_Escape</translation>
     </message>
     <message>
         <source>Key_Space</source>
         <translation>Tecla_Espacio</translation>
     </message>
     <message>
         <source>Key_Home</source>
         <translation>Tecla_Inicio</translation>
     </message>
     <message>
         <source>Key_Calender</source>
         <translation>Tecla_Calendario</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Tecla_Contactos</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Tecla_Menú</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Tecla_Correo</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Tasa muestreo:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Carpeta grabación:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Tecla grabación:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Límite grabación en segundos:</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Sin límite</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Reiniciar Opie si es preciso</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation>Tecla_Grabación</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/systemtime.ts b/i18n/es/systemtime.ts
index cbf1c9d..b2c46a5 100644
--- a/i18n/es/systemtime.ts
+++ b/i18n/es/systemtime.ts
@@ -1,80 +1,266 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SetDateTime</name>
     <message>
         <source>Set System Time</source>
-        <translation>Fijar Hora del Sistema</translation>
+        <translation type="obsolete">Fijar Hora del Sistema</translation>
     </message>
     <message>
         <source>Time Zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Time format</source>
         <translation>Formato hora</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 horas</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 horas</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Inicio semana</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Formato fecha</translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation>Formato icono</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/D hh:mm</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index ae0aaf8..138b9e2 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -1,332 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation>Editar Textos</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Fallo al escribir</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor Textos</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Elegir letra</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>¿Realmente quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
 del dico?&lt;BR&gt;¡Es &lt;B&gt;irreversible!&lt;/B&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</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>Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
     </message>
     <message>
         <source>Advanced Features</source>
-        <translation>Opciones avanzadas</translation>
+        <translation type="obsolete">Opciones avanzadas</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
-        <translation>Preguntar al salir</translation>
+        <translation type="obsolete">Preguntar al salir</translation>
     </message>
     <message>
         <source>Always open linked file</source>
-        <translation>Abrir siempre fichero enlazado</translation>
+        <translation type="obsolete">Abrir siempre fichero enlazado</translation>
     </message>
     <message>
         <source>File Permissions</source>
-        <translation>Permisos fichero</translation>
+        <translation type="obsolete">Permisos fichero</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>El editor de texto ha detectado que&lt;BR&gt;ha seleccionado un fichero&lt;B&gt;.desktop&lt;/B&gt;.
+        <translation type="obsolete">El editor de texto ha detectado que&lt;BR&gt;ha seleccionado un fichero&lt;B&gt;.desktop&lt;/B&gt;.
 &lt;BR&gt;¿Abro el fichero &lt;B&gt;.desktop&lt;/B&gt; o su &lt;B&gt;enlace&lt;/B&gt;?</translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>FontDialog</source>
-        <translation>DiálogoLetra</translation>
+        <translation type="obsolete">DiálogoLetra</translation>
     </message>
     <message>
         <source>Font Dialog</source>
-        <translation>Diálogo de Letra</translation>
+        <translation type="obsolete">Diálogo de Letra</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamaño</translation>
+        <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Letra</translation>
+        <translation type="obsolete">Letra</translation>
     </message>
     <message>
         <source>Font Style</source>
-        <translation>Estilo de letra</translation>
+        <translation type="obsolete">Estilo de letra</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>El Rápido Zorro Marrón Saltó Por Encima Del Perro Perezoso</translation>
+        <translation type="obsolete">El Rápido Zorro Marrón Saltó Por Encima Del Perro Perezoso</translation>
     </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Guardar como</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Acercar</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Alejar</translation>
     </message>
     <message>
         <source>Bold</source>
-        <translation>Negrilla</translation>
+        <translation type="obsolete">Negrilla</translation>
     </message>
     <message>
         <source>Italic</source>
-        <translation>Cursiva</translation>
+        <translation type="obsolete">Cursiva</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Empezar con Nuevo</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar Buscar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor Textos</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>Fichero .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento enlazado</translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation>Sin nombre</translation>
+        <translation type="obsolete">Sin nombre</translation>
     </message>
     <message>
         <source>Permissions</source>
-        <translation>Permisos</translation>
+        <translation type="obsolete">Permisos</translation>
     </message>
     <message>
         <source>FontDialog</source>
-        <translation>DiálogoLetras</translation>
+        <translation type="obsolete">DiálogoLetras</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sí</translation>
+        <translation type="obsolete">Sí</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>No</translation>
+        <translation type="obsolete">No</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Insertar hora y fecha</translation>
     </message>
     <message>
         <source>Advanced features</source>
-        <translation>Funciones avanzadas</translation>
+        <translation type="obsolete">Funciones avanzadas</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>El Editor de Textos ha detectado que&lt;BR&gt;ha seleccionado un fichero &lt;B&gt;.desktop&lt;/B&gt;.&lt;BR&gt;¿Abro &lt;B&gt;.desktop&lt;/B&gt; o el fichero que &lt;B&gt;enlaza&lt;/B&gt;?</translation>
+        <translation type="obsolete">El Editor de Textos ha detectado que&lt;BR&gt;ha seleccionado un fichero &lt;B&gt;.desktop&lt;/B&gt;.&lt;BR&gt;¿Abro &lt;B&gt;.desktop&lt;/B&gt; o el fichero que &lt;B&gt;enlaza&lt;/B&gt;?</translation>
     </message>
     <message>
         <source>Text Edit</source>
-        <translation>Editar Textos</translation>
+        <translation type="obsolete">Editar Textos</translation>
     </message>
     <message>
         <source>Write Failed</source>
-        <translation>Fallo al escribir</translation>
+        <translation type="obsolete">Fallo al escribir</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>¿Realmente quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
+        <translation type="obsolete">¿Realmente quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
 del dico?&lt;BR&gt;¡Es &lt;B&gt;irreversible!&lt;/B&gt;</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>Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
+        <translation type="obsolete">Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
+    </message>
+    <message>
+        <source>Advanced Features</source>
+        <translation type="unfinished">Opciones avanzadas</translation>
+    </message>
+    <message>
+        <source>Prompt on Exit</source>
+        <translation type="unfinished">Preguntar al salir</translation>
+    </message>
+    <message>
+        <source>Always open linked file</source>
+        <translation type="unfinished">Abrir siempre fichero enlazado</translation>
+    </message>
+    <message>
+        <source>File Permissions</source>
+        <translation type="unfinished">Permisos fichero</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fije los Permisos del Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos fichero para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>leer</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escribir</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permisos fichero</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index a0a52a0..44dc3e9 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,210 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertenece a </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No appointments today</source>
-        <translation>No hay citas para hoy</translation>
+        <translation type="obsolete">No hay citas para hoy</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
-        <translation>&lt;b&gt;%1&lt;/b&gt; correos nuevos, &lt;b&gt;%2&lt;/b&gt; salientes</translation>
+        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt; correos nuevos, &lt;b&gt;%2&lt;/b&gt; salientes</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation>Hay &lt;b&gt; 1&lt;/b&gt; tarea pendiente: &lt;br&gt;</translation>
+        <translation type="obsolete">Hay &lt;b&gt; 1&lt;/b&gt; tarea pendiente: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation>Hay &lt;b&gt; %1 &lt;/b&gt; tareas pendientes: &lt;br&gt;</translation>
+        <translation type="obsolete">Hay &lt;b&gt; %1 &lt;/b&gt; tareas pendientes: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
-        <translation>No hay tareas pendientes</translation>
+        <translation type="obsolete">No hay tareas pendientes</translation>
     </message>
     <message>
         <source>No more appointments today</source>
-        <translation>No hay más citas para hoy</translation>
+        <translation type="obsolete">No hay más citas para hoy</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>No encontré módulos</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ningún módulo activado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Piche aquí para lanzar la aplicación asociada</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Opiemail not installed</source>
-        <translation>Opiemail no está instalado</translation>
+        <translation type="obsolete">Opiemail no está instalado</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei</source>
-        <translation>Hoy por Maximilian Rei</translation>
+        <translation type="obsolete">Hoy por Maximilian Rei</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Pinche aquí para obtener el diálogo de configuración</translation>
     </message>
     <message>
-        <source>Today by Maximilian Rei&#xffffffdf;</source>
-        <translation>Hoy por Maximilian Rei&#xffffffdf;</translation>
+        <source>Today by Maximilian Rei?</source>
+        <translation type="obsolete">Hoy por Maximilian Rei￟</translation>
+    </message>
+    <message>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation>Configuración de Hoy</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Cargar qué módulos en qué orden:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mover arriba</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mover abajo</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>activa/orden</translation>
     </message>
     <message>
         <source>autostart on
 resume?
  (Opie only)</source>
-        <translation>arrancar al
+        <translation type="obsolete">arrancar al
 encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minutos inactivo</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
         <translation>Marque una casilla para activar/desactivar un plugin o use las flechas de la derecha para cambiar el orden de aparición</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
     </message>
     <message>
         <source>Icon size</source>
         <translation>Tamaño del icono</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Fijar el tamaño del icono en pixel</translation>
     </message>
+    <message>
+        <source>autostart on 
+resume?
+ (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
-        <translation>Configuración de Hoy</translation>
+        <translation type="obsolete">Configuración de Hoy</translation>
     </message>
     <message>
         <source>Should the
 location
 be shown?</source>
-        <translation>¿Debo mostrar el
+        <translation type="obsolete">¿Debo mostrar el
 lugar de las citas?</translation>
     </message>
     <message>
         <source>Should the notes
 be shown?</source>
-        <translation>¿Debo mostrar las
+        <translation type="obsolete">¿Debo mostrar las
 notas de las citas?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
-        <translation>Mostrar únicamente
+        <translation type="obsolete">Mostrar únicamente
 las citas futuras</translation>
     </message>
     <message>
         <source>How many
 appointment
 should
 be shown?</source>
-        <translation>¿Cuántas citas
+        <translation type="obsolete">¿Cuántas citas
 debo mostrar?</translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation>Calendario</translation>
+        <translation type="obsolete">Calendario</translation>
     </message>
     <message>
         <source>How many
 tasks should
 be shown?</source>
-        <translation>¿Cuantas tareas
+        <translation type="obsolete">¿Cuantas tareas
 debo mostrar?</translation>
     </message>
     <message>
         <source>Tasks</source>
-        <translation>Tareas </translation>
+        <translation type="obsolete">Tareas </translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
-        <translation>Saltar de línea tras
+        <translation type="obsolete">Saltar de línea tras
 cuántas letras</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
-        <translation>¿Arrancar Hoy
+        <translation type="obsolete">¿Arrancar Hoy
 al encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>Activate the
 autostart after how
 many minutes?</source>
-        <translation>¿Activar Hoy tras
+        <translation type="obsolete">¿Activar Hoy tras
 cuántos minutos
 apagado?</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Varios</translation>
+        <translation type="obsolete">Varios</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index 539595e..84aa45b 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -1,420 +1,679 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation>Nueva tarea</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editar tarea</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Eliminar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>Borrar todo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Borrado completado</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation>Tareas completadas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation>Mostrar fecha lí­mite</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categorí­a</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Show over due</source>
-        <translation>Mostrar fuera de plazo</translation>
+        <translation type="obsolete">Mostrar fuera de plazo</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>New from template</source>
         <translation>Nuevo desde plantilla</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Tareas fue incapaz de
 salvar sus cambios.
 Libere algo de espacio
 e inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>¿todas las tareas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>¿todas las tareas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;Han llegado %1 nuevas tareas.&lt;p&gt;¿Desea añadirlas a su lista de tareas?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nuevas tareas</translation>
     </message>
+    <message>
+        <source>Show only over due</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
-        <translation>Lista tareas</translation>
+        <translation type="obsolete">Lista tareas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
-        <translation>Nueva Tarea</translation>
+        <translation type="obsolete">Nueva Tarea</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Categoría:</translation>
+        <translation type="obsolete">Categoría:</translation>
     </message>
     <message>
         <source>Summary:</source>
-        <translation>Sumario:</translation>
+        <translation type="obsolete">Sumario:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
-        <translation>&amp;Completada</translation>
+        <translation type="obsolete">&amp;Completada</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
-        <translation>&amp;Límite</translation>
+        <translation type="obsolete">&amp;Límite</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
-        <translation>1 Ene 2001</translation>
+        <translation type="obsolete">1 Ene 2001</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Prioridad:</translation>
+        <translation type="obsolete">Prioridad:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
-        <translation>1 - Muy alta</translation>
+        <translation type="obsolete">1 - Muy alta</translation>
     </message>
     <message>
         <source>2 - High</source>
-        <translation>2 - Alta</translation>
+        <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
-        <translation>3 - Normal</translation>
+        <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
-        <translation>4 - Baja</translation>
+        <translation type="obsolete">4 - Baja</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
-        <translation>5 - Muy baja</translation>
+        <translation type="obsolete">5 - Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Progreso:</translation>
+        <translation type="obsolete">Progreso:</translation>
     </message>
     <message>
         <source>0%</source>
-        <translation>0%</translation>
+        <translation type="obsolete">0%</translation>
     </message>
     <message>
         <source>20%</source>
-        <translation>20%</translation>
+        <translation type="obsolete">20%</translation>
     </message>
     <message>
         <source>40%</source>
-        <translation>40%</translation>
+        <translation type="obsolete">40%</translation>
     </message>
     <message>
         <source>60%</source>
-        <translation>60%</translation>
+        <translation type="obsolete">60%</translation>
     </message>
     <message>
         <source>80%</source>
-        <translation>80%</translation>
+        <translation type="obsolete">80%</translation>
     </message>
     <message>
         <source>100%</source>
-        <translation>100%</translation>
+        <translation type="obsolete">100%</translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descripción</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation>Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation> día(s)</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
 </context>
 <context>
+    <name>TaskEditorAdvanced</name>
+    <message>
+        <source>Form2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Postponed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintainer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintain Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Form3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished">1 - Muy alta</translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished">2 - Alta</translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished">3 - Normal</translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished">4 - Baja</translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished">5 - Muy baja</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Lista tareas</translation>
+    </message>
+</context>
+<context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation>Editor de plantillas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nueva plantilla %1</translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation>Configurar Platillas</translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
-        <translation>C.</translation>
+        <translation type="obsolete">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
-        <translation>Prior.</translation>
+        <translation type="obsolete">Prior.</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descripción</translation>
+        <translation type="obsolete">Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>Fecha límite</translation>
+        <translation type="obsolete">Fecha límite</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>En blanco</translation>
+        <translation type="obsolete">En blanco</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Todas</translation>
+        <translation type="obsolete">Todas</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
-        <translation>Tareas</translation>
+        <translation type="obsolete">Tareas</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Sin espacio</translation>
+        <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
-        <translation>Incapaz de crear ficheros
+        <translation type="obsolete">Incapaz de crear ficheros
 iniciales. Libere espacio antes
 de introducir algún dato</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nueva tarea</translation>
+        <translation type="obsolete">Nueva tarea</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Editar tarea</translation>
+        <translation type="obsolete">Editar tarea</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Ver tarea</translation>
+        <translation type="obsolete">Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Borrar...</translation>
+        <translation type="obsolete">Borrar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Borrar todo...</translation>
+        <translation type="obsolete">Borrar todo...</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplicar</translation>
+        <translation type="obsolete">Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Emitir</translation>
+        <translation type="obsolete">Emitir</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Buscar</translation>
+        <translation type="obsolete">Buscar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
-        <translation>Tareas completadas</translation>
+        <translation type="obsolete">Tareas completadas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
-        <translation>Mostrar fecha límite</translation>
+        <translation type="obsolete">Mostrar fecha límite</translation>
     </message>
     <message>
         <source>Fonts</source>
-        <translation>Letra</translation>
+        <translation type="obsolete">Letra</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>Datos</translation>
+        <translation type="obsolete">Datos</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Categoría</translation>
+        <translation type="obsolete">Categoría</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opciones</translation>
+        <translation type="obsolete">Opciones</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>No puedo editar datos, estoy sincronizando</translation>
+        <translation type="obsolete">No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Todas</translation>
+        <translation type="obsolete">Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>En blanco</translation>
+        <translation type="obsolete">En blanco</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Sin espacio</translation>
+        <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>Incapaz de salvar sus
+        <translation type="obsolete">Incapaz de salvar sus
 datos. Libere algo de
 espacio e inténtelo
 de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>all tasks</source>
-        <translation>todas las tareas</translation>
+        <translation type="obsolete">todas las tareas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index f97a6f0..64bb3ab 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -16,364 +16,482 @@
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vide</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Lister sous</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email par défaut</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Configurer les champs</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Sélectionner l&apos;ordre des champs :</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trouver</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Ecrire un email à</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Entrée</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mes informations personnelles</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Configurer les champs</translation>
+        <translation type="obsolete">Configurer les champs</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Plus de mémoire disponible</translation>
+        <translation type="obsolete">Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>Pas assez d&apos;espace disponible 
+        <translation type="obsolete">Pas assez d&apos;espace disponible 
 pour créer les fichiers de démarrage
 
 Libérer de la mémoire avant de pouvoir
 saisir des données !</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossible d&apos;accéder aux données, synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editer mes informations personnelles</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editer une adresse</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacts - Mes informations personnelles</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossible d&apos;enregistrer les informations
 Libérer de la mémoire
 et réessayer
 
 Quitter ?</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titre</translation>
+        <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notes</translation>
+        <translation type="obsolete">Notes</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Bureau</translation>
+        <translation type="obsolete">Bureau</translation>
     </message>
     <message>
         <source>Mb</source>
-        <translation>Mo</translation>
+        <translation type="obsolete">Mo</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Prénom</translation>
+        <translation type="obsolete">Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Nom</translation>
+        <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Lister sous</translation>
+        <translation type="obsolete">Lister sous</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Email par défaut</translation>
+        <translation type="obsolete">Email par défaut</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Genre</translation>
+        <translation type="obsolete">Genre</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vide</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petit</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grand</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importer une vCard</translation>
     </message>
+    <message>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save all Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OContacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation>Email par défaut</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titre</translation>
+        <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Second prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Lister sous</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notes</translation>
+        <translation type="obsolete">Notes</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation>Groupes</translation>
+        <translation type="obsolete">Groupes</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Pays</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nom complet...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notes...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Code postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Etats Unies</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grande Bretagne</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japon</translation>
     </message>
     <message>
         <source>France</source>
         <translation>France</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Allemagne</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvège</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculin</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Féminin</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Entrer une note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editer le nom</translation>
@@ -1131,208 +1249,212 @@ Quitter ?</translation>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Ouganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Vénézuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation>Viet Nam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Iles Vierges</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yougoslavie</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambie</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax (Bureau)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (Domicile)</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Téléphone (Bureau)</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Téléphone (Domicile)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Portable (Bureau)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Portable (Domicile)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Page web (Bureau)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Page web (Domicile)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager (Bureau)</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Rue (Bureau)</translation>
+        <translation type="obsolete">Rue (Bureau)</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Rue (Domicile)</translation>
+        <translation type="obsolete">Rue (Domicile)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ville (Bureau)</translation>
+        <translation type="obsolete">Ville (Bureau)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Département (Bureau)</translation>
+        <translation type="obsolete">Département (Bureau)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Code postal (Bureau)</translation>
+        <translation type="obsolete">Code postal (Bureau)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Pays (Bureau)</translation>
+        <translation type="obsolete">Pays (Bureau)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ville (Domicile)</translation>
+        <translation type="obsolete">Ville (Domicile)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Département (Domicile)</translation>
+        <translation type="obsolete">Département (Domicile)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Code postal (Domicile)</translation>
+        <translation type="obsolete">Code postal (Domicile)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Pays (Domicile)</translation>
+        <translation type="obsolete">Pays (Domicile)</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistant</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Epouse</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Enfants</translation>
     </message>
     <message>
         <source>Work Phone</source>
-        <translation>Téléphone (Bureau)</translation>
+        <translation type="obsolete">Téléphone (Bureau)</translation>
     </message>
     <message>
         <source>Work Fax</source>
-        <translation>Fax (Bureau)</translation>
+        <translation type="obsolete">Fax (Bureau)</translation>
     </message>
     <message>
         <source>work Mobile</source>
-        <translation>Portable (Bureau)</translation>
+        <translation type="obsolete">Portable (Bureau)</translation>
     </message>
     <message>
         <source>Work Pager</source>
-        <translation>Pager (Bureau)</translation>
+        <translation type="obsolete">Pager (Bureau)</translation>
     </message>
     <message>
         <source>Work Web Page</source>
-        <translation>Page web (Bureau)</translation>
+        <translation type="obsolete">Page web (Bureau)</translation>
     </message>
     <message>
         <source>Work Mobile</source>
-        <translation>Portable (Bureau)</translation>
+        <translation type="obsolete">Portable (Bureau)</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index 7a1fcf8..7255eeb 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -28,230 +28,234 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation>Exécuter une commande</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Exécuter une commande avec une sortie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Basculer vers &quot;Local&quot;</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Basculer vers &quot;Remote&quot;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>A propos</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous vraiment effacer</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renommer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Répertoire inexistant</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copier sous</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Sortie d&apos;AdvancedFm</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>la commande n&apos;a pas fonctionnée !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envoie Ir.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="obsolete">Changer de répertoire</translation>
+        <translation type="unfinished">Changer de répertoire</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Exécuter</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Ouvrir comme texte</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Créer un lien symbolique</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Information sur le fichier</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>A traduire</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>existe déjà
 Souhaitez-vous vraiment l&apos;effacer ?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Sous</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copier le même répertoire</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sauvegarder la sortie dans un fichier</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir les droits</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir les droits pour :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autres</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lire</translation>
     </message>
     <message>
         <source>write</source>
         <translation>écrire</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>exécuter</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/citytime.ts b/i18n/fr/citytime.ts
index e47bf91..437c17a 100644
--- a/i18n/fr/citytime.ts
+++ b/i18n/fr/citytime.ts
@@ -1,52 +1,68 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Changement d&apos;horaire</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Il a eu un problème dans la mise en place de la zone de temps %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Restaurer la zone de temps</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Il a eu un problème dans la mise en place de la zone de temps. Votre horloge n&apos;est sans doute pas bonne...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>City Time</translation>
     </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Impossible de trouver les informations des zones de temps</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Impossible de trouver les informations de zones de temps dans %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Impossible de trouver la carte</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;Impossible de charger la carte : %1, sortie de l&apos;application</translation>
     </message>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index 73c8ab8..983b6bd 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -98,116 +98,124 @@
     <message>
         <source>Green on Black</source>
         <translation>Vert sur noir</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Noir sur blanc</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanc sur noir</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Noir sur transparent</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Noir sur rouge</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rouge sur noir</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Vert sur jaune</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Bleue sur magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sur bleue</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan sur blanc</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanc sur cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Bleue sur noir</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambre sur noir</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edition rapide</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barre de défilement</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Afficher la liste des commandes</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Cacher la liste des commandes</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personaliser</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection de la commande</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Ajouter une commande</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Entrer la commande à ajouter :</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/keypebble.ts b/i18n/fr/keypebble.ts
index e1e27aa..c951968 100644
--- a/i18n/fr/keypebble.ts
+++ b/i18n/fr/keypebble.ts
@@ -53,189 +53,233 @@ connection.</translation>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>En attente la version du serveur...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Erreur : Version de serveur non valide, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Erreur : La version du serveur n&apos;est pas supportée, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Loggé</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Erreur : Le serveur demande un mot de passe, mais aucun n&apos;a été fourni.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Erreur : Le mot de passe fourni n&apos;est pas correct.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Erreur : Trop de tentatives de login infructueuses ont été faites
 sous ce compte, essayez plus tard.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Echec du login</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Trop d&apos;échecs</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Visualisateur VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Déconnecté</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Cesser le mode &quot;plein écran&quot;</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Connecté à l&apos;hôte distant</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Loggé sur l&apos;hôte distant</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connection terminée</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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">Mot de passe :</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation type="unfinished">Hôte :</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation type="unfinished">Numéro de &quot;display&quot; :</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished">Vérifier la mise à jour de l&apos;écran toutes les :</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished">Millisecondes</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished">Demande de session &quot;8 bits&quot;</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished">Réveil à la cloche</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished">Demande de session partagée</translation>
     </message>
     <message>
         <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">Encodage Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished">Encodage CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished">Encodage RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished">Copier l&apos;encodage rectangle</translation>
     </message>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/kpacman.ts b/i18n/fr/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/fr/kpacman.ts
+++ b/i18n/fr/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/language.ts b/i18n/fr/language.ts
index cde5005..bf64bb9 100644
--- a/i18n/fr/language.ts
+++ b/i18n/fr/language.ts
@@ -1,14 +1,25 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Sélectionner une langue</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libmetal.ts b/i18n/fr/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/fr/libmetal.ts
+++ b/i18n/fr/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index f0ba700..77657ad 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -1,209 +1,292 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ColorPopupMenu</name>
     <message>
         <source>More</source>
-        <translation>Suite</translation>
+        <translation type="obsolete">Suite</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Suite...</translation>
+        <translation type="obsolete">Suite...</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
-        <translation>Teinte :</translation>
+        <translation type="obsolete">Teinte :</translation>
     </message>
     <message>
         <source>Sat:</source>
-        <translation>Saturation :</translation>
+        <translation type="obsolete">Saturation :</translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation>Valeur :</translation>
+        <translation type="obsolete">Valeur :</translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation>Rouge :</translation>
+        <translation type="obsolete">Rouge :</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation>Vert :</translation>
+        <translation type="obsolete">Vert :</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation>Bleu :</translation>
+        <translation type="obsolete">Bleu :</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation>Canal alpha :</translation>
+        <translation type="obsolete">Canal alpha :</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation>Sélectionner une couleur</translation>
+        <translation type="obsolete">Sélectionner une couleur</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>Boite de dialogue de fichiers</translation>
+        <translation type="obsolete">Boite de dialogue de fichiers</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Ouvrir</translation>
+        <translation type="obsolete">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Sauver</translation>
+        <translation type="obsolete">Sauver</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
-        <translation>Documents</translation>
+        <translation type="obsolete">Documents</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation>Fichiers</translation>
+        <translation type="obsolete">Fichiers</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation>Tous les fichiers</translation>
+        <translation type="obsolete">Tous les fichiers</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Tout</translation>
+        <translation type="obsolete">Tout</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation type="obsolete">Nom :</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sauver</translation>
+        <translation type="obsolete">&amp;Sauver</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
-        <translation>&amp;Annuler</translation>
+        <translation type="obsolete">&amp;Annuler</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nom</translation>
+        <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Taille</translation>
+        <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Date</translation>
+        <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation>Type Mime</translation>
+        <translation type="obsolete">Type Mime</translation>
     </message>
     <message>
         <source>Ser Permission</source>
-        <translation>Définir les droits</translation>
+        <translation type="obsolete">Définir les droits</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Effacer</translation>
+        <translation type="obsolete">Effacer</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Voulez-vous vraiment effacer
+        <translation type="obsolete">Voulez-vous vraiment effacer
 </translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Oui</translation>
+        <translation type="obsolete">Oui</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Non</translation>
+        <translation type="obsolete">Non</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation>Grand</translation>
+        <translation type="obsolete">Grand</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Moyen</translation>
+        <translation type="obsolete">Moyen</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation>Petit</translation>
+        <translation type="obsolete">Petit</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Size</source>
+        <translation type="obsolete">Taille</translation>
+    </message>
+</context>
+<context>
+    <name>ORecurranceBase</name>
+    <message>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
-        <translation type="unfinished">Taille</translation>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End On:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
-        <translation>Résumé :</translation>
+        <translation type="obsolete">Résumé :</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Description :</translation>
+        <translation type="obsolete">Description :</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Priorité :</translation>
+        <translation type="obsolete">Priorité :</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Progression :</translation>
+        <translation type="obsolete">Progression :</translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation>Date de fin :</translation>
+        <translation type="obsolete">Date de fin :</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Catégorie :</translation>
+        <translation type="obsolete">Catégorie :</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqdvorak.ts b/i18n/fr/libqdvorak.ts
index a5e2858..a128522 100644
--- a/i18n/fr/libqdvorak.ts
+++ b/i18n/fr/libqdvorak.ts
@@ -1,3 +1,10 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqhandwriting.ts b/i18n/fr/libqhandwriting.ts
index 093ec02..fcd17e2 100644
--- a/i18n/fr/libqhandwriting.ts
+++ b/i18n/fr/libqhandwriting.ts
@@ -1,137 +1,171 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>Aide de la reconnaissance d&apos;écriture</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;Lorsque vous commencez à utiliser la reconnaissance d&apos;écriture, écrivez lentement, avec précision et franchement.&lt;li&gt;Utilisez les guides pour dessinervos caractères.&lt;li&gt;Lorsque vous dessiner un caractère avec plusieurs traits, chaque trait doit avoir été dessiné avant la disparition des traits précédents qui apparaissent en grisés.&lt;li&gt;Entrainez-vous à écrire.&lt;li&gt;Lorsque vous créer vos propres formes de caractères, assurez vous qu&apos;elles sont suffisament différentes des autres formes.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Astuces</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Entrainement</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation>Sélectionner un caractère dans la liste. La one d&apos;écriture à gauche présente les caractères de référence. Entrainez-vous à écrire sur la zone à droite.</translation>
+        <translation type="obsolete">Sélectionner un caractère dans la liste. La one d&apos;écriture à gauche présente les caractères de référence. Entrainez-vous à écrire sur la zone à droite.</translation>
     </message>
     <message>
         <source>Matched: </source>
         <translation>Ressemblance :</translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Similaire à :</translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Nouveau...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Entrée un nouveau caractère</translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation>Délais d&apos;écriture des caractères multi-trait :</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>Affichage des zones d&apos;écriture</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>Zones majuscule et minuscule</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>Zone minuscule (enlever la zone majuscule)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Paramètrage de la reconnaissance d&apos;écriture</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Profile du caractère :</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Péférences</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personnaliser</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Enregistrement des informations
 Impossible.
 Libérer de la mémoire et réessayer.
 
 Quitter ?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqjumpx.ts b/i18n/fr/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/fr/libqjumpx.ts
+++ b/i18n/fr/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqkeyboard.ts b/i18n/fr/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/fr/libqkeyboard.ts
+++ b/i18n/fr/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqkjumpx.ts b/i18n/fr/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/fr/libqkjumpx.ts
+++ b/i18n/fr/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index 7219b7b..4607963 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -239,227 +239,227 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Respecter la casse</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Recherche en sens inverse</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vue &quot;Document&quot;</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Echec de l&apos;effacement du fichier.</translation>
     </message>
     <message>
         <source>Delete Icon and leave file</source>
         <translation type="obsolete">Effacer l&apos;icone et conserver fichier</translation>
     </message>
     <message>
         <source>Icon deletion failed.</source>
         <translation type="obsolete">Echec de l&apos;effacement de l&apos;icone.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copie de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Echec de la copie de fichier.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Echec du déplacement du fichier.</translation>
     </message>
     <message>
         <source>File does not exist.</source>
         <translation type="obsolete">Le fichier n&apos;existe pas.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished">Détails</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Effacer</translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -768,137 +768,153 @@ Free some memory and try again.</source>
     <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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</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>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqpickboard.ts b/i18n/fr/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/fr/libqpickboard.ts
+++ b/i18n/fr/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libqunikeyboard.ts b/i18n/fr/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/fr/libqunikeyboard.ts
+++ b/i18n/fr/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libtheme.ts b/i18n/fr/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/fr/libtheme.ts
+++ b/i18n/fr/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/light-and-power.ts b/i18n/fr/light-and-power.ts
index 44dfa2f..80d23a3 100644
--- a/i18n/fr/light-and-power.ts
+++ b/i18n/fr/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <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>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>Advanced settings for light sensor handling</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>
+        <source>on AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/mediummount.ts b/i18n/fr/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/fr/mediummount.ts
+++ b/i18n/fr/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/opieplayer.ts b/i18n/fr/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/fr/opieplayer.ts
+++ b/i18n/fr/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/oxygen.ts b/i18n/fr/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/fr/oxygen.ts
+++ b/i18n/fr/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/sheetqt.ts b/i18n/fr/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/fr/sheetqt.ts
+++ b/i18n/fr/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/showimg.ts b/i18n/fr/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/fr/showimg.ts
+++ b/i18n/fr/showimg.ts
@@ -1,123 +1,158 @@
 <!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> True color</source>
         <translation type="unfinished"></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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/sound.ts b/i18n/fr/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/fr/sound.ts
+++ b/i18n/fr/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/systemtime.ts b/i18n/fr/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/fr/systemtime.ts
+++ b/i18n/fr/systemtime.ts
@@ -1,80 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index 2e03f75..110b81e 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -1,308 +1,267 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</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>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
     <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Fonte</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="obsolete">Style Fonte</translation>
     </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Enregistrer</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation type="unfinished">Enregistrer Sous</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished">Couper</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished">Copier</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished">Coller</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished">Chercher...</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="obsolete">Gras</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="obsolete">Italique</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">Fichier</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Edition</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">Effacer</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished">Editeur Texte</translation>
     </message>
     <message>
-        <source>Unnamed</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>About</source>
         <translation type="unfinished"></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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</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">propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished">groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished">Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished">Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished">lectire</translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished">écriture</translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></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/fr/today.ts b/i18n/fr/today.ts
index 3a162ff..63e671c 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,166 +1,120 @@
 <!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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 79e60a4..abfe54e 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -1,217 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>NewTaskDialog</name>
+    <name>MainWindow</name>
     <message>
-        <source>Todo List</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40%</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>NewTaskDialog</name>
+</context>
+<context>
+    <name>NewTaskDialogBase</name>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>Todo</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Show Deadline</source>
+        <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Delete all...</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>all tasks</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index 591e4fe..ca8580f 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -14,359 +14,413 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arrange Edit Fields</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is not enough space to create
-neccessary startup files.
-
-Free up some space before
-entering data!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mb</source>
+        <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>First Name</source>
+        <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Name</source>
+        <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
+        <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Email</source>
+        <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
+        <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font</source>
+        <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
+        <source>Unable to find a contact for this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Large</source>
+        <source>search pattern !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import vCard</source>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ContactEditor</name>
+    <name>ConfigDlg_Base</name>
     <message>
-        <source>Default Email</source>
+        <source>MyDialog1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emails</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContactEditor</name>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1121,209 +1175,149 @@ Quit anyway?</source>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</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>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Spouse</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>Work Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Mobile</source>
+        <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuwait</source>
+        <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/checkbook.ts b/i18n/hu/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/hu/checkbook.ts
+++ b/i18n/hu/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/citytime.ts b/i18n/hu/citytime.ts
index 62e2ce2..a250baf 100644
--- a/i18n/hu/citytime.ts
+++ b/i18n/hu/citytime.ts
@@ -1,51 +1,67 @@
 <!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>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/embeddedkonsole.ts b/i18n/hu/embeddedkonsole.ts
index 5251b68..5699a9c 100644
--- a/i18n/hu/embeddedkonsole.ts
+++ b/i18n/hu/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</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/hu/keypebble.ts b/i18n/hu/keypebble.ts
index 7be0f0f..d18d9f6 100644
--- a/i18n/hu/keypebble.ts
+++ b/i18n/hu/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </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>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/kpacman.ts b/i18n/hu/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/hu/kpacman.ts
+++ b/i18n/hu/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/language.ts b/i18n/hu/language.ts
index 6ed8dae..24fd93b 100644
--- a/i18n/hu/language.ts
+++ b/i18n/hu/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libliquid.ts b/i18n/hu/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/hu/libliquid.ts
+++ b/i18n/hu/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/hu/libmetal.ts b/i18n/hu/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/hu/libmetal.ts
+++ b/i18n/hu/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libopie.ts b/i18n/hu/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/hu/libopie.ts
+++ b/i18n/hu/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/hu/libqdvorak.ts b/i18n/hu/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/hu/libqdvorak.ts
+++ b/i18n/hu/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libqhandwriting.ts b/i18n/hu/libqhandwriting.ts
index e7358b9..20ed59b 100644
--- a/i18n/hu/libqhandwriting.ts
+++ b/i18n/hu/libqhandwriting.ts
@@ -1,132 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libqjumpx.ts b/i18n/hu/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/hu/libqjumpx.ts
+++ b/i18n/hu/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libqkeyboard.ts b/i18n/hu/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/hu/libqkeyboard.ts
+++ b/i18n/hu/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libqkjumpx.ts b/i18n/hu/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/hu/libqkjumpx.ts
+++ b/i18n/hu/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libqpe.ts b/i18n/hu/libqpe.ts
index 16a917b..4421779 100644
--- a/i18n/hu/libqpe.ts
+++ b/i18n/hu/libqpe.ts
@@ -51,413 +51,385 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
-        <source>View</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -766,137 +738,153 @@ Free some memory and try again.</source>
     <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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</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>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libqpickboard.ts b/i18n/hu/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/hu/libqpickboard.ts
+++ b/i18n/hu/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libqunikeyboard.ts b/i18n/hu/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/hu/libqunikeyboard.ts
+++ b/i18n/hu/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libtheme.ts b/i18n/hu/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/hu/libtheme.ts
+++ b/i18n/hu/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/light-and-power.ts b/i18n/hu/light-and-power.ts
index 18b2baa..0deb0b7 100644
--- a/i18n/hu/light-and-power.ts
+++ b/i18n/hu/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <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>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>on AC</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>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/mediummount.ts b/i18n/hu/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/hu/mediummount.ts
+++ b/i18n/hu/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/opieplayer.ts b/i18n/hu/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/hu/opieplayer.ts
+++ b/i18n/hu/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/oxygen.ts b/i18n/hu/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/hu/oxygen.ts
+++ b/i18n/hu/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/sheetqt.ts b/i18n/hu/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/hu/sheetqt.ts
+++ b/i18n/hu/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/showimg.ts b/i18n/hu/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/hu/showimg.ts
+++ b/i18n/hu/showimg.ts
@@ -1,123 +1,158 @@
 <!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> True color</source>
         <translation type="unfinished"></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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/sound.ts b/i18n/hu/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/hu/sound.ts
+++ b/i18n/hu/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/systemtime.ts b/i18n/hu/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/hu/systemtime.ts
+++ b/i18n/hu/systemtime.ts
@@ -1,80 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/textedit.ts b/i18n/hu/textedit.ts
index 176a7ce..590359f 100644
--- a/i18n/hu/textedit.ts
+++ b/i18n/hu/textedit.ts
@@ -1,308 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</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>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
-    <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Style</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>About</source>
         <translation type="unfinished"></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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</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>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/hu/today.ts b/i18n/hu/today.ts
index 3a162ff..63e671c 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -1,166 +1,120 @@
 <!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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index 79e60a4..abfe54e 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -1,217 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>NewTaskDialog</name>
+    <name>MainWindow</name>
     <message>
-        <source>Todo List</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40%</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>NewTaskDialog</name>
+</context>
+<context>
+    <name>NewTaskDialogBase</name>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>Todo</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Show Deadline</source>
+        <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Delete all...</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>all tasks</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index 6c94b0f..c18ecc8 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -19,330 +19,424 @@
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email Principale</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Ordina i Contatti</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Ordina i contatti per:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Dati</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo Contatto</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica Contatto</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella Contatto</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova Contatto</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Scrivi Email A</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importa vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Informazioni Personali</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Ordina Contatti</translation>
+        <translation type="obsolete">Ordina Contatti</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Spazio Esaurito</translation>
+        <translation type="obsolete">Spazio Esaurito</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>Non c&apos;è abbastanza spazio per creare
+        <translation type="obsolete">Non c&apos;è abbastanza spazio per creare
 i necessari file di avvio.
 
 Liberare dello spazio prima di
 inserire i dati!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Modifica Dati Personali</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Modifica Dati</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatti - Dati Personali</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossibile salvare i dati.
 Liberare dello spazio
 e riprovare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Note</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Lavoro</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="obsolete">Mb</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Cognome</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Visualizza come</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email Principale</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sesso</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation>OContatti</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Phone Book</source>
         <translation>Elenco Numeri Telefonici</translation>
     </message>
     <message>
         <source>Company Book</source>
         <translation>Elenco Compagnia</translation>
     </message>
     <message>
         <source>Email Book</source>
         <translation>Elenco Email</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartellini</translation>
     </message>
+    <message>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save all Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Business Fax</source>
         <translation>Fax Ufficio</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Abitazione</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefono Ufficio</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tleefono Abitazione</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Cellulare Ufficio</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Cellulare Abitazione</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pagina Web Ufficio</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Cercapersone Ufficio</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Altre Email</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Società</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizzazione</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Note</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Gruppi</translation>
     </message>
     <message>
@@ -1264,98 +1358,102 @@ Uscire comunque?</translation>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Inserisci Note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Modifica Nome</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Dipartimento</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Professione</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Direttore</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Coniuge</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Figli</translation>
     </message>
     <message>
         <source>Work Phone</source>
         <translation type="obsolete">Telefono Ufficio</translation>
     </message>
     <message>
         <source>Work Fax</source>
         <translation type="obsolete">Fax Ufficio</translation>
     </message>
     <message>
         <source>work Mobile</source>
         <translation type="obsolete">Cellulare Ufficio</translation>
     </message>
     <message>
         <source>Work Pager</source>
         <translation type="obsolete">Cercapersone Ufficio</translation>
     </message>
     <message>
         <source>Work Web Page</source>
         <translation type="obsolete">Pagina Web Ufficio</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Work Mobile</source>
         <translation type="obsolete">Cellulare Ufficio</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Paese Lavoro</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation>Kyrgystan</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/checkbook.ts b/i18n/it/checkbook.ts
index 04db676..4befc99 100644
--- a/i18n/it/checkbook.ts
+++ b/i18n/it/checkbook.ts
@@ -1,299 +1,718 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Checkbook</name>
+    <message>
+        <source>Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transactions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter name of checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished">Tipo:</translation>
+    </message>
+    <message>
+        <source>Select type of checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bank:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter name of the bank for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Account number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter account number for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PIN number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter PIN number for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting balance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the initial balance for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current balance: %10.00</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area shows the current balance in this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add a new transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a transaction and then click here to edit it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here to delete it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the desired chart below and then click on the Draw button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the desired chart type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Account balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Withdrawals by category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deposits by category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to draw the selected chart.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current balance: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete transaction</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all checkbooks currently available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
-        <translation>Dettagli Traduzione</translation>
+        <translation type="obsolete">Dettagli Traduzione</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
-        <translation>Automobile</translation>
+        <translation type="obsolete">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Conti</translation>
+        <translation type="obsolete">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Vestiti</translation>
+        <translation type="obsolete">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Computer</translation>
+        <translation type="obsolete">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVD</translation>
+        <translation type="obsolete">DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Elettronica</translation>
+        <translation type="obsolete">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Intrattenimento</translation>
+        <translation type="obsolete">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Cibo</translation>
+        <translation type="obsolete">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Benzina</translation>
+        <translation type="obsolete">Benzina</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Varie</translation>
+        <translation type="obsolete">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Film</translation>
+        <translation type="obsolete">Film</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Affitto</translation>
+        <translation type="obsolete">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Viaggio</translation>
+        <translation type="obsolete">Viaggio</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation>Debito</translation>
+        <translation type="obsolete">Debito</translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation>Assegno</translation>
+        <translation type="obsolete">Assegno</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation>Trasferimento</translation>
+        <translation type="obsolete">Trasferimento</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation>Carta di Credito</translation>
+        <translation type="obsolete">Carta di Credito</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Lavoro</translation>
+        <translation type="obsolete">Lavoro</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Familiare</translation>
+        <translation type="obsolete">Familiare</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Credito</translation>
+        <translation type="obsolete">Credito</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
-        <translation>Pagamento Automatico</translation>
+        <translation type="obsolete">Pagamento Automatico</translation>
     </message>
     <message>
         <source>Cash</source>
-        <translation>Contante</translation>
+        <translation type="obsolete">Contante</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntryBase</name>
     <message>
         <source>Account Transaction</source>
-        <translation>Transazioni Conto</translation>
+        <translation type="obsolete">Transazioni Conto</translation>
     </message>
     <message>
         <source>$</source>
-        <translation>E</translation>
+        <translation type="obsolete">E</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Categoria:</translation>
+        <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Descrizione:</translation>
+        <translation type="obsolete">Descrizione:</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation>Tipo:</translation>
+        <translation type="obsolete">Tipo:</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Ammontare:</translation>
+        <translation type="obsolete">Ammontare:</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Automobile</translation>
+        <translation type="obsolete">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Conti</translation>
+        <translation type="obsolete">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Vestiti</translation>
+        <translation type="obsolete">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Computer</translation>
+        <translation type="obsolete">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVD</translation>
+        <translation type="obsolete">DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Elettronica</translation>
+        <translation type="obsolete">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Intrattenimento</translation>
+        <translation type="obsolete">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Cibo</translation>
+        <translation type="obsolete">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Benzina</translation>
+        <translation type="obsolete">Benzina</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Varie</translation>
+        <translation type="obsolete">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Film</translation>
+        <translation type="obsolete">Film</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Affitto</translation>
+        <translation type="obsolete">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Viaggio</translation>
+        <translation type="obsolete">Viaggio</translation>
     </message>
     <message>
         <source>Check Number:</source>
-        <translation>Numero:</translation>
+        <translation type="obsolete">Numero:</translation>
     </message>
     <message>
         <source>Extra Fee:</source>
-        <translation>Spesa Extra:</translation>
+        <translation type="obsolete">Spesa Extra:</translation>
     </message>
     <message>
         <source>Additional Notes:</source>
-        <translation>Note Aggiuntive:</translation>
+        <translation type="obsolete">Note Aggiuntive:</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation>Data:</translation>
+        <translation type="obsolete">Data:</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation>Debito</translation>
+        <translation type="obsolete">Debito</translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation>Assegno</translation>
+        <translation type="obsolete">Assegno</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation>Trasferimento</translation>
+        <translation type="obsolete">Trasferimento</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation>Carta di Credito</translation>
+        <translation type="obsolete">Carta di Credito</translation>
     </message>
     <message>
         <source>Deposit</source>
-        <translation>Deposito</translation>
+        <translation type="obsolete">Deposito</translation>
     </message>
     <message>
         <source>Payment</source>
-        <translation>Pagamento</translation>
+        <translation type="obsolete">Pagamento</translation>
     </message>
 </context>
 <context>
     <name>QCheckGraphBase</name>
     <message>
         <source>Account Graph</source>
-        <translation>Grafico Conto</translation>
+        <translation type="obsolete">Grafico Conto</translation>
     </message>
 </context>
 <context>
     <name>QCheckMMBase</name>
     <message>
         <source>Main Menu</source>
-        <translation>Menu Principale</translation>
+        <translation type="obsolete">Menu Principale</translation>
     </message>
     <message>
         <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
-        <translation>Seleziona i libri qui sotto o premi l&apos;icona &quot;Nuovo&quot; nella barra.</translation>
+        <translation type="obsolete">Seleziona i libri qui sotto o premi l&apos;icona &quot;Nuovo&quot; nella barra.</translation>
     </message>
 </context>
 <context>
     <name>QCheckNameBase</name>
     <message>
         <source>Check Book Name</source>
-        <translation>Controlla Nome Libro</translation>
+        <translation type="obsolete">Controlla Nome Libro</translation>
     </message>
     <message>
         <source>Name...</source>
-        <translation>Nome...</translation>
+        <translation type="obsolete">Nome...</translation>
     </message>
     <message>
         <source>Please name your check book (limit: 15 characters):</source>
-        <translation>Inserisci il nome del check book (limite: 15 caratteri):</translation>
+        <translation type="obsolete">Inserisci il nome del check book (limite: 15 caratteri):</translation>
     </message>
     <message>
         <source>&amp;Done</source>
-        <translation>&amp;Fatto</translation>
+        <translation type="obsolete">&amp;Fatto</translation>
     </message>
 </context>
 <context>
     <name>QCheckViewBase</name>
     <message>
         <source>Account Transactions</source>
-        <translation>Transazioni Conto</translation>
+        <translation type="obsolete">Transazioni Conto</translation>
     </message>
     <message>
         <source>$0.00</source>
-        <translation>E0.00</translation>
+        <translation type="obsolete">E0.00</translation>
     </message>
     <message>
         <source>Balance:</source>
-        <translation>Bilancio:</translation>
+        <translation type="obsolete">Bilancio:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
-        <translation>Spazio Esaurito</translation>
+        <translation type="obsolete">Spazio Esaurito</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
-        <translation>Impossibile creare il file di
+        <translation type="obsolete">Impossibile creare il file di
 configurazione per questa
 applicazione.
 Liberare dello spazio e
 riprovare.</translation>
     </message>
 </context>
+<context>
+    <name>Transaction</name>
+    <message>
+        <source>Transaction for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Withdrawal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deposit</source>
+        <translation type="unfinished">Deposito</translation>
+    </message>
+    <message>
+        <source>Date:</source>
+        <translation type="unfinished">Data:</translation>
+    </message>
+    <message>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter check number here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished">Descrizione:</translation>
+    </message>
+    <message>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished">Categoria:</translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished">Tipo:</translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished">Ammontare:</translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Automobile</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Conti</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Vestiti</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Computer</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVD</translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished">Elettronica</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Intrattenimento</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Cibo</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Benzina</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Varie</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Film</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Affitto</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Viaggio</translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished">Debito</translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished">Assegno</translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished">Trasferimento</translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished">Carta di Credito</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Lavoro</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Familiare</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Credito</translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished">Pagamento Automatico</translation>
+    </message>
+    <message>
+        <source>Cash</source>
+        <translation type="unfinished">Contante</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/embeddedkonsole.ts b/i18n/it/embeddedkonsole.ts
index 072d31e..54bf455 100644
--- a/i18n/it/embeddedkonsole.ts
+++ b/i18n/it/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta su Blu</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan su Bianco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bianco su Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blu su Nero</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambra su Nero</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizzato</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Inserisci</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spazio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Modifica veloce</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Disattiva</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra di Scorrimento</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Visualizza Lista Comandi</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Nascondi Lista Comandi</translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selezione Comandi</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Inserisci comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Inserisci comando da aggiungere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index a050536..65fc92e 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -780,139 +780,155 @@ riprovare.</translation>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Figli</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuovo Documento</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;La guida completa non è disponibile per questa applicazione, è comunque presente la guida base.&lt;p&gt;Per usare la guida:&lt;p&gt;&lt;ol&gt;&lt;li&gt;tieni premuto il tasto di aiuto.&lt;li&gt;quando apparirà &lt;b&gt;Cos&apos;è...&lt;/b&gt;, premi un qualunque tasto.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Cos&apos;è...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Premi per chiudere questa finestra, abbandonando le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Premi per chiudere questa finestra.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Premi per chiudere questa finestra e salvare le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Premi per spostare la finestra.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Premi per ingrandire al massimo questa finestra.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Card CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Card SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Hard Disk SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria Interna</translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 file</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Tutti i %1 file</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tutti i file</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/light-and-power.ts b/i18n/it/light-and-power.ts
index 88740a9..7a1cf75 100644
--- a/i18n/it/light-and-power.ts
+++ b/i18n/it/light-and-power.ts
@@ -1,53 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Calibration</name>
+    <message>
+        <source>%1 Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light and Power Settings</source>
         <translation>Risparmio Energetico</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
-        <translation>Sistema l&apos;ambiente</translation>
+        <translation type="obsolete">Sistema l&apos;ambiente</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>Mentre è in uso il dispositivo, la luminosità dello schermo può essere adattata automaticamente rilevando l&apos;intesità della luce ambientale. La regolazione della luminosità influisce comunque sulla luminosità media.</translation>
     </message>
     <message>
         <source>Power saving</source>
-        <translation>Luminosità</translation>
+        <translation type="obsolete">Luminosità</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation> secondi</translation>
+        <translation type="obsolete"> secondi</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Riduci dopo</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Sospendi dopo</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
-        <translation>Disattiva LCD durante sospensione</translation>
+        <translation type="obsolete">Disattiva LCD durante sospensione</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Spegni dopo</translation>
     </message>
     <message>
         <source>Bright</source>
-        <translation>Luminoso</translation>
+        <translation type="obsolete">Luminoso</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
-        <translation>&lt;blockquote&gt;Più luminoso è lo schermo, più batteria viene utilizzata.&lt;/blockquote&gt;</translation>
+        <translation type="obsolete">&lt;blockquote&gt;Più luminoso è lo schermo, più batteria viene utilizzata.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Spento</translation>
     </message>
+    <message>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished">Spento</translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/oxygen.ts b/i18n/it/oxygen.ts
index 350ed07..ae0f3a3 100644
--- a/i18n/it/oxygen.ts
+++ b/i18n/it/oxygen.ts
@@ -1,133 +1,109 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation>Calcola</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso Molecolare</translation>
     </message>
     <message>
         <source>chemical Formula</source>
         <translation type="obsolete">Formula Chimica</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso Molecolare (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composizione Molecolare (%):</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Formula Chimica</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation>Peso</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Blocco</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elettronegatività</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Raggio atomico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energ. ionizzazione</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densità</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Punto ebollizione</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Punto fusione</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation>%1 nm</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Dati</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Calcoli</translation>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index fa36be9..e872185 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sincronizzazione</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contatti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/today.ts b/i18n/it/today.ts
index dced9f9..bbfe45d 100644
--- a/i18n/it/today.ts
+++ b/i18n/it/today.ts
@@ -39,174 +39,190 @@
         <translation type="obsolete">Non ci sono promemoria attivi</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Nessun plugin trovato</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nessun plugin attivato</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Clicca qui per lanciare l&apos;app. associata</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Opiemail not installed</source>
         <translation type="obsolete">Opiemail non installato</translation>
     </message>
     <message>
         <source>Today&#xb2;</source>
         <translation type="obsolete">Oggi²</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Oggi by Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Clicca qui per andare alle impostazioni</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Carica i plugin nell&apos;ordine:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Sposta Sopra</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Sposta Sotto</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>attivo/ordine</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation>avvio automatico al(new line)
 resume?(new line)
 (solo Opie)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation>minuti inattivi</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
         <translation>Clicca qui per attivare/disattivare il plugin o utilizza le frecce direzionali sulla destra per modificare l&apos;ordine di visualizzazione</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Clicca qui se l&apos;applicazione deve partire automaticamente al riavvio.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation>Quanti minuti il PDA deve rimanere spento prima che entri in funzione l&apos;autostart</translation>
     </message>
     <message>
         <source>Icon size</source>
         <translation>Dimensioni Icona</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
         <translation>Imposta la dimensione dell&apos;icona in pixel</translation>
     </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="obsolete">Configurazione di &apos;Oggi&apos;</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="obsolete">Visualizzare
 la posizione?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="obsolete">Visualizzare le
 note?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="obsolete">Mostrare solo gli
 appuntamenti successivi?</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="obsolete">Quanti
 appuntamenti
 visualizzare?</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="obsolete">Rubrica</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="obsolete">Quanti promemoria
 visualizzare?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="obsolete">Promemoria</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="obsolete">Quanti caratteri
 visualizzare?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="obsolete">Avviare &apos;Oggi&apos; 
 automaticamente
 all&apos;accensione?</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="obsolete">Dopo quanti
 minuti attivare
 l&apos;avvio automatico?</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Varie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/addressbook.ts b/i18n/ja/addressbook.ts
index 591e4fe..ca8580f 100644
--- a/i18n/ja/addressbook.ts
+++ b/i18n/ja/addressbook.ts
@@ -14,359 +14,413 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arrange Edit Fields</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is not enough space to create
-neccessary startup files.
-
-Free up some space before
-entering data!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mb</source>
+        <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>First Name</source>
+        <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Name</source>
+        <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
+        <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Email</source>
+        <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
+        <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font</source>
+        <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
+        <source>Unable to find a contact for this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Large</source>
+        <source>search pattern !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import vCard</source>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ContactEditor</name>
+    <name>ConfigDlg_Base</name>
     <message>
-        <source>Default Email</source>
+        <source>MyDialog1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emails</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContactEditor</name>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1121,209 +1175,149 @@ Quit anyway?</source>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</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>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Spouse</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>Work Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Mobile</source>
+        <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuwait</source>
+        <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/advancedfm.ts b/i18n/ja/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/ja/advancedfm.ts
+++ b/i18n/ja/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/checkbook.ts b/i18n/ja/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/ja/checkbook.ts
+++ b/i18n/ja/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/citytime.ts b/i18n/ja/citytime.ts
index 62e2ce2..a250baf 100644
--- a/i18n/ja/citytime.ts
+++ b/i18n/ja/citytime.ts
@@ -1,51 +1,67 @@
 <!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>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/embeddedkonsole.ts b/i18n/ja/embeddedkonsole.ts
index 5251b68..5699a9c 100644
--- a/i18n/ja/embeddedkonsole.ts
+++ b/i18n/ja/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</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/ja/keypebble.ts b/i18n/ja/keypebble.ts
index 7be0f0f..d18d9f6 100644
--- a/i18n/ja/keypebble.ts
+++ b/i18n/ja/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </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>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/kpacman.ts b/i18n/ja/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/ja/kpacman.ts
+++ b/i18n/ja/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/language.ts b/i18n/ja/language.ts
index 6ed8dae..24fd93b 100644
--- a/i18n/ja/language.ts
+++ b/i18n/ja/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libliquid.ts b/i18n/ja/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/ja/libliquid.ts
+++ b/i18n/ja/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/ja/libmetal.ts b/i18n/ja/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/ja/libmetal.ts
+++ b/i18n/ja/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libopie.ts b/i18n/ja/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/ja/libopie.ts
+++ b/i18n/ja/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/ja/libqdvorak.ts b/i18n/ja/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/ja/libqdvorak.ts
+++ b/i18n/ja/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libqhandwriting.ts b/i18n/ja/libqhandwriting.ts
index e7358b9..20ed59b 100644
--- a/i18n/ja/libqhandwriting.ts
+++ b/i18n/ja/libqhandwriting.ts
@@ -1,132 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libqjumpx.ts b/i18n/ja/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/ja/libqjumpx.ts
+++ b/i18n/ja/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libqkeyboard.ts b/i18n/ja/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/ja/libqkeyboard.ts
+++ b/i18n/ja/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libqkjumpx.ts b/i18n/ja/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/ja/libqkjumpx.ts
+++ b/i18n/ja/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libqpe.ts b/i18n/ja/libqpe.ts
index 16a917b..4421779 100644
--- a/i18n/ja/libqpe.ts
+++ b/i18n/ja/libqpe.ts
@@ -51,413 +51,385 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
-        <source>View</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -766,137 +738,153 @@ Free some memory and try again.</source>
     <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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</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>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/libqpickboard.ts b/i18n/ja/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/ja/libqpickboard.ts
+++ b/i18n/ja/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libqunikeyboard.ts b/i18n/ja/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/ja/libqunikeyboard.ts
+++ b/i18n/ja/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/libtheme.ts b/i18n/ja/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/ja/libtheme.ts
+++ b/i18n/ja/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/light-and-power.ts b/i18n/ja/light-and-power.ts
index 18b2baa..0deb0b7 100644
--- a/i18n/ja/light-and-power.ts
+++ b/i18n/ja/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <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>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>on AC</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>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/mediummount.ts b/i18n/ja/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/ja/mediummount.ts
+++ b/i18n/ja/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/opieplayer.ts b/i18n/ja/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/ja/opieplayer.ts
+++ b/i18n/ja/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/oxygen.ts b/i18n/ja/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/ja/oxygen.ts
+++ b/i18n/ja/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/ja/qpe.ts b/i18n/ja/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/ja/qpe.ts
+++ b/i18n/ja/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/sheetqt.ts b/i18n/ja/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/ja/sheetqt.ts
+++ b/i18n/ja/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/showimg.ts b/i18n/ja/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/ja/showimg.ts
+++ b/i18n/ja/showimg.ts
@@ -1,123 +1,158 @@
 <!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> True color</source>
         <translation type="unfinished"></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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/sound.ts b/i18n/ja/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/ja/sound.ts
+++ b/i18n/ja/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/systemtime.ts b/i18n/ja/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/ja/systemtime.ts
+++ b/i18n/ja/systemtime.ts
@@ -1,80 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/textedit.ts b/i18n/ja/textedit.ts
index 176a7ce..590359f 100644
--- a/i18n/ja/textedit.ts
+++ b/i18n/ja/textedit.ts
@@ -1,308 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</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>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
-    <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Style</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>About</source>
         <translation type="unfinished"></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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</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>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/ja/today.ts b/i18n/ja/today.ts
index 3a162ff..63e671c 100644
--- a/i18n/ja/today.ts
+++ b/i18n/ja/today.ts
@@ -1,166 +1,120 @@
 <!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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/ja/todolist.ts b/i18n/ja/todolist.ts
index 79e60a4..abfe54e 100644
--- a/i18n/ja/todolist.ts
+++ b/i18n/ja/todolist.ts
@@ -1,217 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>NewTaskDialog</name>
+    <name>MainWindow</name>
     <message>
-        <source>Todo List</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40%</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>NewTaskDialog</name>
+</context>
+<context>
+    <name>NewTaskDialogBase</name>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>Todo</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Show Deadline</source>
+        <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Delete all...</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>all tasks</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>
diff --git a/i18n/ko/addressbook.ts b/i18n/ko/addressbook.ts
index 9b90992..b315263 100644
--- a/i18n/ko/addressbook.ts
+++ b/i18n/ko/addressbook.ts
@@ -16,364 +16,478 @@
     </message>
     <message>
         <source>Unfiled</source>
         <translation>정리하지 않음</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation>직위</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>이름</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>성</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>정렬할 이름</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>기본 이메일 주소</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>기타</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>성별</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished">필드의 순서 정하기</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished">필드의 순서를 고르세요</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">위로</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">아래로</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>주소록</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>연락처</translation>
     </message>
     <message>
         <source>New</source>
         <translation>새로</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>편집</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>지우기</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>찾기</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>이메일 쓰기</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>무선으로 보내기</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>개인 정보</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>필드의 순서 정하기</translation>
+        <translation type="obsolete">필드의 순서 정하기</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>자리 보족</translation>
+        <translation type="obsolete">자리 보족</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>필요한 시작 파일들을 만들 
+        <translation type="obsolete">필요한 시작 파일들을 만들 
 자리가 부족합니다.
 
 새 정보를 입력하기 전에 용량을 
 비우시기 바랍니다.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>보기</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>지금 싱크 중이므로, 정보를 편집 할수 없습니다.</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>개인정보 편집</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>주소 편집</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>연락처 - 개인정보</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>용량 부족</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>정보를 저장할수 없습니다.
 자리를 비우시고 
 다시 해보시기 바랍니다.
 
 그래도 끝낼까요?</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>직위</translation>
+        <translation type="obsolete">직위</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>기타</translation>
+        <translation type="obsolete">기타</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>회사</translation>
-    </message>
-    <message>
-        <source>Mb</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">회사</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>이름</translation>
+        <translation type="obsolete">이름</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>성</translation>
+        <translation type="obsolete">성</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>정렬할 이름</translation>
+        <translation type="obsolete">정렬할 이름</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>기본 이메일 주소</translation>
+        <translation type="obsolete">기본 이메일 주소</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>성</translation>
+        <translation type="obsolete">성</translation>
     </message>
     <message>
         <source>All</source>
         <translation>모두</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>정렬 안됨</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>글꼴</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>작은</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>보통</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>큰</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>vCard 읽어 오기</translation>
     </message>
+    <message>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save all Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OContacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation>기본 이메일 주소</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>이메일 주소들</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>직위</translation>
+        <translation type="obsolete">직위</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>이름</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>중간 이름</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>성</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation>정렬할 이름</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>성</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>직업명</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>회사</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>기타</translation>
+        <translation type="obsolete">기타</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation>분류들</translation>
+        <translation type="obsolete">분류들</translation>
     </message>
     <message>
         <source>City</source>
         <translation>도시</translation>
     </message>
     <message>
         <source>State</source>
         <translation>주</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>나라</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>성명</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>조직</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>분류</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>기타...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>일반적인</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>회사</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>집</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>주소</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>우편번호</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>미국</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>영국</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>일본</translation>
     </message>
     <message>
         <source>France</source>
         <translation>프랑스</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>독일</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>노르웨이</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>카네다</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>남성</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>여성</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>자세한 정보</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>노트 입력</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>이름 편집</translation>
@@ -1131,208 +1245,212 @@ Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>회사 팩스</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>집 팩스</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>회사 전화</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>집 전화</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>회사 핸드폰</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>집 핸드폰</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>회사 웹사이트</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>집 웹사이트</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>회사 삐삐</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>회사 주소</translation>
+        <translation type="obsolete">회사 주소</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>집 주소</translation>
+        <translation type="obsolete">집 주소</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>회사 도시</translation>
+        <translation type="obsolete">회사 도시</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>회사 주</translation>
+        <translation type="obsolete">회사 주</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>회사 우편번호</translation>
+        <translation type="obsolete">회사 우편번호</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>회사 국가</translation>
+        <translation type="obsolete">회사 국가</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>집 도시</translation>
+        <translation type="obsolete">집 도시</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>집 주</translation>
+        <translation type="obsolete">집 주</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>집 우편번호</translation>
+        <translation type="obsolete">집 우편번호</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation type="unfinished">집 국가</translation>
+        <translation type="obsolete">집 국가</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>부</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>회사</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>직업</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>비서</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>매니저</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>배우자</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>생일</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>결혼 기념일</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>별명</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>자식들</translation>
     </message>
     <message>
         <source>Work Phone</source>
-        <translation>회사 전화</translation>
+        <translation type="obsolete">회사 전화</translation>
     </message>
     <message>
         <source>Work Fax</source>
-        <translation>회사 팩스</translation>
+        <translation type="obsolete">회사 팩스</translation>
     </message>
     <message>
         <source>work Mobile</source>
-        <translation>회사 핸드폰</translation>
+        <translation type="obsolete">회사 핸드폰</translation>
     </message>
     <message>
         <source>Work Pager</source>
-        <translation>회사 삐삐</translation>
+        <translation type="obsolete">회사 삐삐</translation>
     </message>
     <message>
         <source>Work Web Page</source>
-        <translation>회사 웹사이트</translation>
+        <translation type="obsolete">회사 웹사이트</translation>
     </message>
     <message>
         <source>Work Mobile</source>
-        <translation>회사 핸드폰</translation>
+        <translation type="obsolete">회사 핸드폰</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/advancedfm.ts b/i18n/ko/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/ko/advancedfm.ts
+++ b/i18n/ko/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/checkbook.ts b/i18n/ko/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/ko/checkbook.ts
+++ b/i18n/ko/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/citytime.ts b/i18n/ko/citytime.ts
index 62e2ce2..a250baf 100644
--- a/i18n/ko/citytime.ts
+++ b/i18n/ko/citytime.ts
@@ -1,51 +1,67 @@
 <!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>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/embeddedkonsole.ts b/i18n/ko/embeddedkonsole.ts
index 5251b68..5699a9c 100644
--- a/i18n/ko/embeddedkonsole.ts
+++ b/i18n/ko/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</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/ko/keypebble.ts b/i18n/ko/keypebble.ts
index 7be0f0f..d18d9f6 100644
--- a/i18n/ko/keypebble.ts
+++ b/i18n/ko/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </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>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/kpacman.ts b/i18n/ko/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/ko/kpacman.ts
+++ b/i18n/ko/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/language.ts b/i18n/ko/language.ts
index 6ed8dae..24fd93b 100644
--- a/i18n/ko/language.ts
+++ b/i18n/ko/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libliquid.ts b/i18n/ko/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/ko/libliquid.ts
+++ b/i18n/ko/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/ko/libmetal.ts b/i18n/ko/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/ko/libmetal.ts
+++ b/i18n/ko/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libopie.ts b/i18n/ko/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/ko/libopie.ts
+++ b/i18n/ko/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/ko/libqdvorak.ts b/i18n/ko/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/ko/libqdvorak.ts
+++ b/i18n/ko/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libqhandwriting.ts b/i18n/ko/libqhandwriting.ts
index e7358b9..20ed59b 100644
--- a/i18n/ko/libqhandwriting.ts
+++ b/i18n/ko/libqhandwriting.ts
@@ -1,132 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libqjumpx.ts b/i18n/ko/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/ko/libqjumpx.ts
+++ b/i18n/ko/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libqkeyboard.ts b/i18n/ko/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/ko/libqkeyboard.ts
+++ b/i18n/ko/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libqkjumpx.ts b/i18n/ko/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/ko/libqkjumpx.ts
+++ b/i18n/ko/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libqpe.ts b/i18n/ko/libqpe.ts
index 16a917b..4421779 100644
--- a/i18n/ko/libqpe.ts
+++ b/i18n/ko/libqpe.ts
@@ -51,413 +51,385 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
-        <source>View</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -766,137 +738,153 @@ Free some memory and try again.</source>
     <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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</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>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/libqpickboard.ts b/i18n/ko/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/ko/libqpickboard.ts
+++ b/i18n/ko/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libqunikeyboard.ts b/i18n/ko/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/ko/libqunikeyboard.ts
+++ b/i18n/ko/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/libtheme.ts b/i18n/ko/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/ko/libtheme.ts
+++ b/i18n/ko/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/light-and-power.ts b/i18n/ko/light-and-power.ts
index 18b2baa..0deb0b7 100644
--- a/i18n/ko/light-and-power.ts
+++ b/i18n/ko/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <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>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>on AC</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>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/mediummount.ts b/i18n/ko/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/ko/mediummount.ts
+++ b/i18n/ko/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/opieplayer.ts b/i18n/ko/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/ko/opieplayer.ts
+++ b/i18n/ko/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/oxygen.ts b/i18n/ko/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/ko/oxygen.ts
+++ b/i18n/ko/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/ko/qpe.ts b/i18n/ko/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/ko/qpe.ts
+++ b/i18n/ko/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/sheetqt.ts b/i18n/ko/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/ko/sheetqt.ts
+++ b/i18n/ko/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/showimg.ts b/i18n/ko/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/ko/showimg.ts
+++ b/i18n/ko/showimg.ts
@@ -1,123 +1,158 @@
 <!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> True color</source>
         <translation type="unfinished"></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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/sound.ts b/i18n/ko/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/ko/sound.ts
+++ b/i18n/ko/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/systemtime.ts b/i18n/ko/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/ko/systemtime.ts
+++ b/i18n/ko/systemtime.ts
@@ -1,80 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/textedit.ts b/i18n/ko/textedit.ts
index 3566e06..084212e 100644
--- a/i18n/ko/textedit.ts
+++ b/i18n/ko/textedit.ts
@@ -121,189 +121,180 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <source>Zoom out</source>
         <translation>축소</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="obsolete">볼드</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="obsolete">이탈릭</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>줄을 감기</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>새 문서으로 시작하기</translation>
     </message>
     <message>
         <source>File</source>
         <translation>파일</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>편집</translation>
     </message>
     <message>
         <source>View</source>
         <translation>보기</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>다음 찾기</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>닫기</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>지우기</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>텍스트 편집기</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="obsolete">무명</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>글꼴</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="obsolete">권한</translation>
     </message>
     <message>
         <source>FontDialog</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>About</source>
         <translation>정보</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>.desktop 파일</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>링크된 문서</translation>
     </message>
     <message>
         <source>All</source>
         <translation>모두</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>텍스트</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced features</source>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>파일 권한 설정</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>파일 권한 설정:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>주인</translation>
     </message>
     <message>
         <source>group</source>
         <translation>그룹</translation>
     </message>
     <message>
         <source>others</source>
         <translation>기타</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>주인</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>그룹</translation>
     </message>
     <message>
         <source>read</source>
         <translation>읽기</translation>
     </message>
     <message>
         <source>write</source>
         <translation>쓰기</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>실행</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>경고</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>에러- 유저가 없음</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>에러- 그룹이 없음</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>소유권이나 그룹을 설정하는데 에러 발생</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>모드 설정하는데 에러 발생</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/today.ts b/i18n/ko/today.ts
index 3a162ff..63e671c 100644
--- a/i18n/ko/today.ts
+++ b/i18n/ko/today.ts
@@ -1,166 +1,120 @@
 <!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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/ko/todolist.ts b/i18n/ko/todolist.ts
index 8d7d35b..17595f3 100644
--- a/i18n/ko/todolist.ts
+++ b/i18n/ko/todolist.ts
@@ -1,225 +1,604 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>MainWindow</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">새 할일</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">할일 편집</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation type="unfinished">할일 보기</translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation type="unfinished">지우기...</translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation type="unfinished">모두 지우기...</translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">복사 하기</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished">무선 전송</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished">찾기</translation>
+    </message>
+    <message>
+        <source>Completed tasks</source>
+        <translation type="unfinished">성취한 일들을 표시</translation>
+    </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished">마감일을 표시</translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished">데이타</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">분류</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">옵션들</translation>
+    </message>
+    <message>
+        <source>Show only over due</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation type="unfinished">모든 분류</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation type="unfinished">자리 부족</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished">수정된 데이타를 저장할수 
+없었습니다.
+자리를 비우시고 
+다시 해보시기 바랍니다.
+
+그래도 끝낼까요?</translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished">할일</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">현제 싱크 중이므로 데이타 편집 불가</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
-        <translation>할일 목록</translation>
+        <translation type="obsolete">할일 목록</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
-        <translation type="unfinished">새 할일</translation>
+        <translation type="obsolete">새 할일</translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>Priority:</source>
+        <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Description</source>
+        <translation type="unfinished">설명</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">할일 편집</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>C.</source>
+        <translation type="unfinished">成</translation>
+    </message>
+    <message>
+        <source>Prior.</source>
+        <translation type="unfinished">우선순위</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">설명</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished">마감</translation>
+    </message>
+    <message>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvanced</name>
+    <message>
+        <source>Form2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintain Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Form3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">분류</translation>
+    </message>
+    <message>
+        <source>Enable Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">할일 목록</translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
-        <translation>成</translation>
+        <translation type="obsolete">成</translation>
     </message>
     <message>
         <source>Prior.</source>
-        <translation>우선순위</translation>
+        <translation type="obsolete">우선순위</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>설명</translation>
+        <translation type="obsolete">설명</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>정렬 안됨</translation>
+        <translation type="obsolete">정렬 안됨</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>모두</translation>
+        <translation type="obsolete">모두</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>마감</translation>
+        <translation type="obsolete">마감</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
-        <translation>할일</translation>
+        <translation type="obsolete">할일</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>자리 부족</translation>
+        <translation type="obsolete">자리 부족</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
-        <translation>시작 파일들을 만들수 없습니다.
+        <translation type="obsolete">시작 파일들을 만들수 없습니다.
 정보를 입력하기 전에 
 자리를 비워두시기 바랍니다.</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>새 할일</translation>
+        <translation type="obsolete">새 할일</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>무선 전송</translation>
+        <translation type="obsolete">무선 전송</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>찾기</translation>
+        <translation type="obsolete">찾기</translation>
     </message>
     <message>
         <source>Completed tasks</source>
-        <translation>성취한 일들을 표시</translation>
+        <translation type="obsolete">성취한 일들을 표시</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>현제 싱크 중이므로 데이타 편집 불가</translation>
+        <translation type="obsolete">현제 싱크 중이므로 데이타 편집 불가</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>할일 편집</translation>
+        <translation type="obsolete">할일 편집</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation>모든 분류</translation>
+        <translation type="obsolete">모든 분류</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>정리 안된것들</translation>
+        <translation type="obsolete">정리 안된것들</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>자리 부족</translation>
+        <translation type="obsolete">자리 부족</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>수정된 데이타를 저장할수 
+        <translation type="obsolete">수정된 데이타를 저장할수 
 없었습니다.
 자리를 비우시고 
 다시 해보시기 바랍니다.
 
 그래도 끝낼까요?</translation>
     </message>
     <message>
         <source>Show Deadline</source>
-        <translation>마감일을 표시</translation>
+        <translation type="obsolete">마감일을 표시</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>데이타</translation>
+        <translation type="obsolete">데이타</translation>
     </message>
     <message>
         <source>Fonts</source>
-        <translation>글꼴</translation>
+        <translation type="obsolete">글꼴</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>할일 보기</translation>
+        <translation type="obsolete">할일 보기</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>지우기...</translation>
+        <translation type="obsolete">지우기...</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>모두 지우기...</translation>
+        <translation type="obsolete">모두 지우기...</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>복사 하기</translation>
+        <translation type="obsolete">복사 하기</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>분류</translation>
+        <translation type="obsolete">분류</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>옵션들</translation>
+        <translation type="obsolete">옵션들</translation>
     </message>
     <message>
         <source>all tasks</source>
-        <translation>모든 할일</translation>
+        <translation type="obsolete">모든 할일</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/addressbook.ts b/i18n/no/addressbook.ts
index 591e4fe..ca8580f 100644
--- a/i18n/no/addressbook.ts
+++ b/i18n/no/addressbook.ts
@@ -14,359 +14,413 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arrange Edit Fields</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is not enough space to create
-neccessary startup files.
-
-Free up some space before
-entering data!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mb</source>
+        <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>First Name</source>
+        <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Name</source>
+        <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
+        <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Email</source>
+        <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
+        <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font</source>
+        <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
+        <source>Unable to find a contact for this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Large</source>
+        <source>search pattern !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import vCard</source>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ContactEditor</name>
+    <name>ConfigDlg_Base</name>
     <message>
-        <source>Default Email</source>
+        <source>MyDialog1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emails</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContactEditor</name>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1121,209 +1175,149 @@ Quit anyway?</source>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</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>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Spouse</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>Work Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Mobile</source>
+        <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuwait</source>
+        <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/checkbook.ts b/i18n/no/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/no/checkbook.ts
+++ b/i18n/no/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/citytime.ts b/i18n/no/citytime.ts
index 62e2ce2..a250baf 100644
--- a/i18n/no/citytime.ts
+++ b/i18n/no/citytime.ts
@@ -1,51 +1,67 @@
 <!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>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/embeddedkonsole.ts b/i18n/no/embeddedkonsole.ts
index 5251b68..5699a9c 100644
--- a/i18n/no/embeddedkonsole.ts
+++ b/i18n/no/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</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/no/keypebble.ts b/i18n/no/keypebble.ts
index 7be0f0f..d18d9f6 100644
--- a/i18n/no/keypebble.ts
+++ b/i18n/no/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </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>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/kpacman.ts b/i18n/no/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/no/kpacman.ts
+++ b/i18n/no/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/language.ts b/i18n/no/language.ts
index 6ed8dae..24fd93b 100644
--- a/i18n/no/language.ts
+++ b/i18n/no/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libliquid.ts b/i18n/no/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/no/libliquid.ts
+++ b/i18n/no/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/no/libmetal.ts b/i18n/no/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/no/libmetal.ts
+++ b/i18n/no/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libopie.ts b/i18n/no/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/no/libopie.ts
+++ b/i18n/no/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/no/libqdvorak.ts b/i18n/no/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/no/libqdvorak.ts
+++ b/i18n/no/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libqhandwriting.ts b/i18n/no/libqhandwriting.ts
index e7358b9..20ed59b 100644
--- a/i18n/no/libqhandwriting.ts
+++ b/i18n/no/libqhandwriting.ts
@@ -1,132 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libqjumpx.ts b/i18n/no/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/no/libqjumpx.ts
+++ b/i18n/no/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libqkeyboard.ts b/i18n/no/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/no/libqkeyboard.ts
+++ b/i18n/no/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libqkjumpx.ts b/i18n/no/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/no/libqkjumpx.ts
+++ b/i18n/no/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index 16a917b..4421779 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -51,413 +51,385 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
-        <source>View</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -766,137 +738,153 @@ Free some memory and try again.</source>
     <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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</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>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libqpickboard.ts b/i18n/no/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/no/libqpickboard.ts
+++ b/i18n/no/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libqunikeyboard.ts b/i18n/no/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/no/libqunikeyboard.ts
+++ b/i18n/no/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libtheme.ts b/i18n/no/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/no/libtheme.ts
+++ b/i18n/no/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/light-and-power.ts b/i18n/no/light-and-power.ts
index 18b2baa..0deb0b7 100644
--- a/i18n/no/light-and-power.ts
+++ b/i18n/no/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <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>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>on AC</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>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/mediummount.ts b/i18n/no/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/no/mediummount.ts
+++ b/i18n/no/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/opieplayer.ts b/i18n/no/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/no/opieplayer.ts
+++ b/i18n/no/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/oxygen.ts b/i18n/no/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/no/oxygen.ts
+++ b/i18n/no/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/no/qpe.ts b/i18n/no/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/no/qpe.ts
+++ b/i18n/no/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/sheetqt.ts b/i18n/no/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/no/sheetqt.ts
+++ b/i18n/no/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/showimg.ts b/i18n/no/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/no/showimg.ts
+++ b/i18n/no/showimg.ts
@@ -1,123 +1,158 @@
 <!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> True color</source>
         <translation type="unfinished"></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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/sound.ts b/i18n/no/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/no/sound.ts
+++ b/i18n/no/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/systemtime.ts b/i18n/no/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/no/systemtime.ts
+++ b/i18n/no/systemtime.ts
@@ -1,80 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/textedit.ts b/i18n/no/textedit.ts
index 176a7ce..590359f 100644
--- a/i18n/no/textedit.ts
+++ b/i18n/no/textedit.ts
@@ -1,308 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</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>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
-    <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Style</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>About</source>
         <translation type="unfinished"></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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</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>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/no/today.ts b/i18n/no/today.ts
index 3a162ff..63e671c 100644
--- a/i18n/no/today.ts
+++ b/i18n/no/today.ts
@@ -1,166 +1,120 @@
 <!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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/no/todolist.ts b/i18n/no/todolist.ts
index 79e60a4..abfe54e 100644
--- a/i18n/no/todolist.ts
+++ b/i18n/no/todolist.ts
@@ -1,217 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>NewTaskDialog</name>
+    <name>MainWindow</name>
     <message>
-        <source>Todo List</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40%</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>NewTaskDialog</name>
+</context>
+<context>
+    <name>NewTaskDialogBase</name>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>Todo</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Show Deadline</source>
+        <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Delete all...</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>all tasks</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>
diff --git a/i18n/opie-i18n-da.control b/i18n/opie-i18n-da.control
new file mode 100644
index 0000000..e52669e
--- a/dev/null
+++ b/i18n/opie-i18n-da.control
@@ -0,0 +1,9 @@
+Files: i18n/dk/.directory 
+Priority: optional
+Section: opie/i18n
+Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
+Description: i18n: Danish
+ Danish UI texts and dictionary for OPIE environment.
diff --git a/i18n/opie-i18n-de.control b/i18n/opie-i18n-de.control
index 32be8aa..a5137d8 100644
--- a/i18n/opie-i18n-de.control
+++ b/i18n/opie-i18n-de.control
@@ -1,9 +1,9 @@
 Files: i18n/de/.directory i18n/de/*.qm etc/dict/dawg.de
 Priority: optional
 Section: opie/i18n
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: i18n: Deutsch
- German UI texts and dictionary for Qtopia environment.
+ German UI texts and dictionary for OPIE environment.
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index f4be76d..53c2fcb 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -15,363 +15,477 @@
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Pusty</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Jako</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Domyslny e-mail</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notatka</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Plec</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Rozmiesc pola edycji</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Wybierz kolejnosc pol:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gora</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Znajdz</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Napisz e-mail</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Zgloszenia</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Moje dane</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Porzadkuj pola edycji</translation>
+        <translation type="obsolete">Porzadkuj pola edycji</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Brak miejsca</translation>
+        <translation type="obsolete">Brak miejsca</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>Brak miejsca w pamieci
+        <translation type="obsolete">Brak miejsca w pamieci
 na pliki startowe.
 
 Zwolnij miejsce w pamieci!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nie mozna zmieniac danych podczas synchronizacji</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Edycja moich danych</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Edycja adresu</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakty - moje dane</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca w pamieci</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nie mozna zapisac informacji.
 Zwilnij miejsce w pamieci
 i sprobuj ponownie
 
 Zakonczyc?</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Tytul</translation>
+        <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notatka</translation>
+        <translation type="obsolete">Notatka</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Praca</translation>
-    </message>
-    <message>
-        <source>Mb</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Praca</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Imie</translation>
+        <translation type="obsolete">Imie</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Nazwisko</translation>
+        <translation type="obsolete">Nazwisko</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Jako</translation>
+        <translation type="obsolete">Jako</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Domyslny e-mail</translation>
+        <translation type="obsolete">Domyslny e-mail</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Plec</translation>
+        <translation type="obsolete">Plec</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>nieprzydzielony</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Maly</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalny</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Duzy</translation>
     </message>
     <message>
         <source>Import vCard</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>Save all Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OContacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation>Domyslny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-maile</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Tytul</translation>
+        <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Jako</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Plec</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Temat pracy</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notatka</translation>
+        <translation type="obsolete">Notatka</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation>Grupa</translation>
+        <translation type="obsolete">Grupa</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Wojewodztwo</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Panstwo</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Pelna nazwa...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notatka...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Podstawowe</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Biznes</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Kod pocztowy</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Stany Zjednoczone</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Anglia</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
@@ -1128,209 +1242,149 @@ Zakonczyc?</translation>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mezczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegoly</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Wprowadz notatke</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Edytuj notatke</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</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>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Spouse</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>Work Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Mobile</source>
+        <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuwait</source>
+        <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/checkbook.ts b/i18n/pl/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/pl/checkbook.ts
+++ b/i18n/pl/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/citytime.ts b/i18n/pl/citytime.ts
index 67b736d..dcb79e8 100644
--- a/i18n/pl/citytime.ts
+++ b/i18n/pl/citytime.ts
@@ -1,51 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Czas zmieniony</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Jest problem z ustawieniem strony czasowej %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Przywracam Strefe Czasowa</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Jest problem z ustwaieniem twojej strefy czasowej. Twoj czas moze byc bledny...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Czasy w miastach</translation>
     </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Nie moge znalesc informacji o strefie czasowej</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Nie moge znalesc zadnej strefy czasowej w %1</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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/embeddedkonsole.ts b/i18n/pl/embeddedkonsole.ts
index 50684c9..bc84285 100644
--- a/i18n/pl/embeddedkonsole.ts
+++ b/i18n/pl/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Cyan on White</source>
         <translation>Cyan na bialym</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Biale na cyanie</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Niebieskie na czarnym</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber na czarnym</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Wprowadz</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spacja</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gora</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Szybka edycja</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Lewo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Prawo</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Przewijanie</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Wyswietl liste komend</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ukryj liste komend</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybor komendy</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj komende</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Wprowadz komende do dodania:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/keypebble.ts b/i18n/pl/keypebble.ts
index d4cd2ba..99574ab 100644
--- a/i18n/pl/keypebble.ts
+++ b/i18n/pl/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Oczekiwanie na wersje serwera...</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>Zalogowany</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>Blad logowania</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Zbyt duzo bledow</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Klient VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Caly ekran</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Rozlaczono</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Do okna</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Polaczono do zdalnego serwera</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Zalogowano na zdalnym serwerze</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Polaczenie zamkniete</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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">Haslo:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation type="unfinished">Nazwa serwera:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation type="unfinished">Numer pulpitu:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished">Sprawdz zmiany na pulpicie co:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished">Milisekund</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished">Zarzadaj 8-bit sesji</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished">Zarzadaj wspoldzielonej sesji</translation>
     </message>
     <message>
         <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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/kpacman.ts b/i18n/pl/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/pl/kpacman.ts
+++ b/i18n/pl/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/language.ts b/i18n/pl/language.ts
index 03708a8..a74552f 100644
--- a/i18n/pl/language.ts
+++ b/i18n/pl/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation>Jezyk</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Wybierz jezyk</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libliquid.ts b/i18n/pl/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/pl/libliquid.ts
+++ b/i18n/pl/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/pl/libmetal.ts b/i18n/pl/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/pl/libmetal.ts
+++ b/i18n/pl/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopie.ts b/i18n/pl/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/pl/libopie.ts
+++ b/i18n/pl/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libqdvorak.ts b/i18n/pl/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/pl/libqdvorak.ts
+++ b/i18n/pl/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libqhandwriting.ts b/i18n/pl/libqhandwriting.ts
index f61cc5a..4bec590 100644
--- a/i18n/pl/libqhandwriting.ts
+++ b/i18n/pl/libqhandwriting.ts
@@ -1,136 +1,166 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Podpowiedz</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Szkolka</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation>Rozpoznano: </translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Podobne do: </translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Nowy...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Domyslnie</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Wyczysc</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Wprowadz nowy znak</translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation>Czas oczekiwania na znaczki wielo-kreskowe</translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>Wyswietlaj obszary do wprowadzania</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>Duze i male znaki</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>Male znaki (przelaczane na duze)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Ustawienia odrecznego wpisywania</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Profile:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Wlasciwosci</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Wlasne</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nie moge zapisac informacji.
 Zrob wiecej miejsca
 i sprobuj ponownie.
 
 Zakonczyc?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libqjumpx.ts b/i18n/pl/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/pl/libqjumpx.ts
+++ b/i18n/pl/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libqkeyboard.ts b/i18n/pl/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/pl/libqkeyboard.ts
+++ b/i18n/pl/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libqkjumpx.ts b/i18n/pl/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/pl/libqkjumpx.ts
+++ b/i18n/pl/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index b827a6f..4f25e95 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -195,270 +195,270 @@ edytuje kategorie.</translation>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished">Znajdz</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Brak tekstu.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Znajdz</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Co szukac:</translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation type="obsolete">&amp;Znajdz</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>kategoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Zacznij szukac od:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Gru 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Rozrozniaj wielkosc</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Szukaj wstecz</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Widok dokumentu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Usuwanie nie powiodlo sie.</translation>
     </message>
     <message>
         <source>Delete Icon and leave file</source>
         <translation type="obsolete">Usun ikona i zostaw plik</translation>
     </message>
     <message>
         <source>Icon deletion failed.</source>
         <translation type="obsolete">Blad usuwania ikony</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopia z </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Blad kopiowania.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegoly</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Blad przenoszenia dokumentu.</translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Szczegoly</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentarz:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Szybkie ladowanie (wykorzystuje pamiec)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Del Icon</source>
         <translation type="obsolete">Usun ikone</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>informacje wlasciciela</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Wprowadz haslo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Jest problem z utworzeniem
 Informacji Konfiguracyjnych
 dla tego programu.
 
 Zwolnij wiecej pamieci i
 sprobuj ponownie.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Nie moge utworzyc plikow startowych
 Prosze zrob wiecej miejsca
 w pamieci</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Nie moge uruchomic alarmu
 Zwolnij wiecej pamieci</translation>
@@ -776,138 +776,154 @@ Zwolnij wiecej pamieci</translation>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Pseudonim</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Dzieci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notatka</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupy</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nie moge ustawic alarmu.
 Zwolnij wiecej miejsca w pamieci</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libqpickboard.ts b/i18n/pl/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/pl/libqpickboard.ts
+++ b/i18n/pl/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libqunikeyboard.ts b/i18n/pl/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/pl/libqunikeyboard.ts
+++ b/i18n/pl/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libtheme.ts b/i18n/pl/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/pl/libtheme.ts
+++ b/i18n/pl/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/light-and-power.ts b/i18n/pl/light-and-power.ts
index 23a1981..375be7c 100644
--- a/i18n/pl/light-and-power.ts
+++ b/i18n/pl/light-and-power.ts
@@ -1,53 +1,171 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Calibration</name>
+    <message>
+        <source>%1 Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Adjust to environment</source>
-        <translation>Wyrownaj do srodowiska</translation>
+        <translation type="obsolete">Wyrownaj do srodowiska</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>Sensor swiatla ustawi poziom podswietlenia automatycznie</translation>
     </message>
     <message>
         <source>Power saving</source>
-        <translation>Oszczednosc energii</translation>
+        <translation type="obsolete">Oszczednosc energii</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation> sekund</translation>
+        <translation type="obsolete"> sekund</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Wylacz swiatlo po</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Przyciemnij swiatlo po</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Zasnij po</translation>
     </message>
     <message>
         <source>Bright</source>
-        <translation>Jasnosc</translation>
+        <translation type="obsolete">Jasnosc</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
-        <translation>&lt;blockquote&gt;Im jasniej tym wiecej potrzeba energii.&lt;/blockquote&gt;</translation>
+        <translation type="obsolete">&lt;blockquote&gt;Im jasniej tym wiecej potrzeba energii.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Wylacz</translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Light and Power Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished">Wylacz</translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/mediummount.ts b/i18n/pl/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/pl/mediummount.ts
+++ b/i18n/pl/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/opieplayer.ts b/i18n/pl/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/pl/opieplayer.ts
+++ b/i18n/pl/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/oxygen.ts b/i18n/pl/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/pl/oxygen.ts
+++ b/i18n/pl/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/sheetqt.ts b/i18n/pl/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/pl/sheetqt.ts
+++ b/i18n/pl/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/showimg.ts b/i18n/pl/showimg.ts
index 5aa7313..e0a99ea 100644
--- a/i18n/pl/showimg.ts
+++ b/i18n/pl/showimg.ts
@@ -1,123 +1,158 @@
 <!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>Przegladarka obrazow</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Odbicie oiziome</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Odbicie pionowe</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otworz</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Obroc o 180</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Obroc o 90</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pelny ekran</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Przegladarka obrazow</translation>
     </message>
     <message>
         <source> True color</source>
         <translation> Pelny kolor</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">Obroc o 270</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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/sound.ts b/i18n/pl/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/pl/sound.ts
+++ b/i18n/pl/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/systemtime.ts b/i18n/pl/systemtime.ts
index 2506f95..f50dabe 100644
--- a/i18n/pl/systemtime.ts
+++ b/i18n/pl/systemtime.ts
@@ -1,80 +1,266 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SetDateTime</name>
     <message>
         <source>Set System Time</source>
-        <translation>Ustaw czas systemowy</translation>
+        <translation type="obsolete">Ustaw czas systemowy</translation>
     </message>
     <message>
         <source>Time Zone</source>
         <translation>Strefa czasowa</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time format</source>
         <translation>Format czasu</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 godziny</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 godzin</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Tydzien zaczyna sie w</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziele</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedzialek</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Format daty</translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation>Format apletu</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>gg:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>D/M gg:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation>Godzin</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuta</translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/textedit.ts b/i18n/pl/textedit.ts
index d61a90e..ceba9d8 100644
--- a/i18n/pl/textedit.ts
+++ b/i18n/pl/textedit.ts
@@ -1,308 +1,291 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished">Nienazwany</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished">Edytor tekstu</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished">Uprawnienia</translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished">Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished">Nie</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>FontDialog</name>
     <message>
         <source>FontDialog</source>
         <translation type="obsolete">WyborCzcionki</translation>
     </message>
     <message>
         <source>Font Dialog</source>
         <translation type="obsolete">Wybor czcionki</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Rozmiar</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Font Style</source>
         <translation type="obsolete">Styl</translation>
     </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otworz</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Znajdz...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Powieksz</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Pomniejsz</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="obsolete">Pogrobiona</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="obsolete">Pochyla</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Zawijal linie</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Zacznij w nowym pliku</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Znajdz nastepny</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zamknij wyszukiwanie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Edytor tekstu</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="obsolete">Nienazwany</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="obsolete">Uprawnienia</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="obsolete">WyborCzcionki</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="obsolete">Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></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">Wszystkie</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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Ustaw uprawnienia</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ustaw uprawnienia dla:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>wlasciciel</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupa</translation>
     </message>
     <message>
         <source>others</source>
         <translation>inni</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Wlasciciel</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
     <message>
         <source>read</source>
         <translation>odczyt</translation>
     </message>
     <message>
         <source>write</source>
         <translation>zapis</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>wykonywanie</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Uwaga</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Blad- nie ma uzytkownika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Blad- brak grupy</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Blad ustawiania uprawnien</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Blad ustawienia trybu</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 92460a2..63e671c 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -1,166 +1,120 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>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 appointments today</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No more appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index 8d19c42..a051306 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -1,217 +1,556 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>MainWindow</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Nowy proces</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Edycja procesu</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished">Znajdz</translation>
+    </message>
+    <message>
+        <source>Completed tasks</source>
+        <translation type="unfinished">Zakonczonych procesow</translation>
+    </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished">Wyswietl Deadline</translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show only over due</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation type="unfinished">Wszystkie kategorie</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation type="unfinished">Brak pamieci</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished">ZrobTo</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">Nieprzypisany</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
-        <translation>Lista ZrobTo</translation>
+        <translation type="obsolete">Lista ZrobTo</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
-        <translation>Nowy proces</translation>
+        <translation type="obsolete">Nowy proces</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Priorytet:</translation>
+        <translation type="obsolete">Priorytet:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
-        <translation>1 - Bardzo wysoki</translation>
+        <translation type="obsolete">1 - Bardzo wysoki</translation>
     </message>
     <message>
         <source>2 - High</source>
-        <translation>2 - Wysoki</translation>
+        <translation type="obsolete">2 - Wysoki</translation>
     </message>
     <message>
         <source>3 - Normal</source>
-        <translation>3 - Normalny</translation>
+        <translation type="obsolete">3 - Normalny</translation>
     </message>
     <message>
         <source>4 - Low</source>
-        <translation>4 - Niski</translation>
+        <translation type="obsolete">4 - Niski</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
-        <translation>5 - Bardzo niski</translation>
+        <translation type="obsolete">5 - Bardzo niski</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Kategoria:</translation>
+        <translation type="obsolete">Kategoria:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
-        <translation>&amp;Kompletny</translation>
+        <translation type="obsolete">&amp;Kompletny</translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>D&amp;ue</source>
+        <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>40%</source>
+        <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>Edit Task</source>
+        <translation type="unfinished">Edycja procesu</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Table View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>C.</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Prior.</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation>Opis</translation>
+        <source>Started</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation>Nieprzypisany</translation>
+        <source>Postponed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
-        <translation>Wszystkie</translation>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source>Not started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintainer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintain Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Todo</source>
-        <translation>ZrobTo</translation>
+        <source>Form3</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
-        <translation>Brak pamieci</translation>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
-        <translation>Nowy proces</translation>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Find</source>
-        <translation>Znajdz</translation>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
-        <translation>Zakonczonych procesow</translation>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>1 - Very High</source>
+        <translation type="unfinished">1 - Bardzo wysoki</translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished">2 - Wysoki</translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished">3 - Normalny</translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished">4 - Niski</translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished">5 - Bardzo niski</translation>
+    </message>
+    <message>
+        <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation>Edycja procesu</translation>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation>Wszystkie kategorie</translation>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation>Nieprzypisany</translation>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation>Brak pamieci</translation>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Deadline</source>
-        <translation>Wyswietl Deadline</translation>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
-        <translation>Czcionka</translation>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all...</source>
+        <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Lista ZrobTo</translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
     <message>
-        <source>all tasks</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodoTable</name>
+    <message>
+        <source>Description</source>
+        <translation type="obsolete">Opis</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="obsolete">Nieprzypisany</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Wszystkie</translation>
+    </message>
+</context>
+<context>
+    <name>TodoWindow</name>
+    <message>
+        <source>Todo</source>
+        <translation type="obsolete">ZrobTo</translation>
+    </message>
+    <message>
+        <source>Out of Space</source>
+        <translation type="obsolete">Brak pamieci</translation>
+    </message>
+    <message>
+        <source>New Task</source>
+        <translation type="obsolete">Nowy proces</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="obsolete">Znajdz</translation>
+    </message>
+    <message>
+        <source>Completed tasks</source>
+        <translation type="obsolete">Zakonczonych procesow</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="obsolete">Edycja procesu</translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation type="obsolete">Wszystkie kategorie</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="obsolete">Nieprzypisany</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation type="obsolete">Brak pamieci</translation>
+    </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="obsolete">Wyswietl Deadline</translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="obsolete">Czcionka</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index 9a79b6a..cface5d 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -15,364 +15,482 @@
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-Mail</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Arrumar Campos</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Ordem dos campos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Enviar EMail</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Irradiar Entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Dados</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Arrumar Campos</translation>
+        <translation type="obsolete">Arrumar Campos</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Sem Espaço</translation>
+        <translation type="obsolete">Sem Espaço</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>Não há espaço livre para
+        <translation type="obsolete">Não há espaço livre para
 guardar os ficheiros iniciais.
 
 Liberte algum espaço
 antes de introduzir dados!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar os Meus Dados</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Meus Dados</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Não há espaço para
 guardar os dados. 
 Liberte algum e tente de novo.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Escritório</translation>
+        <translation type="obsolete">Escritório</translation>
     </message>
     <message>
         <source>Mb</source>
-        <translation>Mb</translation>
+        <translation type="obsolete">Mb</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Apelido</translation>
+        <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Ficheiro Como</translation>
+        <translation type="obsolete">Ficheiro Como</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>E-Mail Principal</translation>
+        <translation type="obsolete">E-Mail Principal</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Sexo</translation>
+        <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar cartão de visita</translation>
     </message>
+    <message>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save all Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OContacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation>E-Mail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-Mails</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation type="unfinished">Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished">Empresa</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished">Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation type="unfinished">Grupos</translation>
+        <translation type="obsolete">Grupos</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Emprego</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código Postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Inglaterra</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japão</translation>
     </message>
     <message>
         <source>France</source>
         <translation>França</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemanha</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introduza Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nome</translation>
@@ -1130,208 +1248,212 @@ Sair na mesma?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrânia</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguai</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Juguslávia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zâmbia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax (Empresa)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (Pessoal)</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefone (Empresa)</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefone (Pessoal)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Telemóvel (Pessoal)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Site (Empresa)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Site (Pessoal)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager (Empresa)</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation type="unfinished">Rua (Empresa)</translation>
+        <translation type="obsolete">Rua (Empresa)</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation type="unfinished">Rua (Pessoal)</translation>
+        <translation type="obsolete">Rua (Pessoal)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation type="unfinished">Cidade (Empresa)</translation>
+        <translation type="obsolete">Cidade (Empresa)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation type="unfinished">Estado (Empresa)</translation>
+        <translation type="obsolete">Estado (Empresa)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation type="unfinished">Cód Postal (Empresa)</translation>
+        <translation type="obsolete">Cód Postal (Empresa)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation type="unfinished">País (Empresa)</translation>
+        <translation type="obsolete">País (Empresa)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation type="unfinished">Cidade (Pessoal)</translation>
+        <translation type="obsolete">Cidade (Pessoal)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation type="unfinished">Estado (Pessoal)</translation>
+        <translation type="obsolete">Estado (Pessoal)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation type="unfinished">Cód. Postal (Pessoal)</translation>
+        <translation type="obsolete">Cód. Postal (Pessoal)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation type="unfinished">País (Pessoal)</translation>
+        <translation type="obsolete">País (Pessoal)</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Chefe</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Esposa</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alcunha</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Filhos</translation>
     </message>
     <message>
         <source>Work Phone</source>
-        <translation>Telefone (Empresa)</translation>
+        <translation type="obsolete">Telefone (Empresa)</translation>
     </message>
     <message>
         <source>Work Fax</source>
-        <translation>Fax (Empresa)</translation>
+        <translation type="obsolete">Fax (Empresa)</translation>
     </message>
     <message>
         <source>work Mobile</source>
-        <translation>Telemóvel (Empresa)</translation>
+        <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Work Pager</source>
-        <translation>Pager (Empresa)</translation>
+        <translation type="obsolete">Pager (Empresa)</translation>
     </message>
     <message>
         <source>Work Web Page</source>
-        <translation>Site (Empresa)</translation>
+        <translation type="obsolete">Site (Empresa)</translation>
     </message>
     <message>
         <source>Work Mobile</source>
-        <translation>Telemóvel (Empresa)</translation>
+        <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index abb7195..94eeb66 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</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>&amp;Ok</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>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Executar</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>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</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>Propriedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/checkbook.ts b/i18n/pt/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/pt/checkbook.ts
+++ b/i18n/pt/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/citytime.ts b/i18n/pt/citytime.ts
index 456d1bb..bfea9b0 100644
--- a/i18n/pt/citytime.ts
+++ b/i18n/pt/citytime.ts
@@ -1,51 +1,67 @@
 <!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>Fusos Horários</translation>
     </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/embeddedkonsole.ts b/i18n/pt/embeddedkonsole.ts
index a86240b..d4bc1de 100644
--- a/i18n/pt/embeddedkonsole.ts
+++ b/i18n/pt/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Cyan on White</source>
         <translation>Ciano em Branco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Branco em Ciano</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul em Preto</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambar em Preto</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fontes</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edição Rápida</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção de Comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Adicionar comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a adicionar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/keypebble.ts b/i18n/pt/keypebble.ts
index 4eac967..c5362ac 100644
--- a/i18n/pt/keypebble.ts
+++ b/i18n/pt/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </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>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/kpacman.ts b/i18n/pt/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/pt/kpacman.ts
+++ b/i18n/pt/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/language.ts b/i18n/pt/language.ts
index 84f6ace..d923a9e 100644
--- a/i18n/pt/language.ts
+++ b/i18n/pt/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation>Linguagem</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Escolha a linguagem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libliquid.ts b/i18n/pt/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/pt/libliquid.ts
+++ b/i18n/pt/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/pt/libmetal.ts b/i18n/pt/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/pt/libmetal.ts
+++ b/i18n/pt/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopie.ts b/i18n/pt/libopie.ts
index 7dcb8c1..ef62f7d 100644
--- a/i18n/pt/libopie.ts
+++ b/i18n/pt/libopie.ts
@@ -1,207 +1,261 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
     <message>
         <source>More</source>
-        <translation>Mais</translation>
+        <translation type="obsolete">Mais</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Mais...</translation>
+        <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Sat:</source>
-        <translation>Sat:</translation>
+        <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation>Val:</translation>
+        <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation>Vermelho:</translation>
+        <translation type="obsolete">Vermelho:</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation>Verde:</translation>
+        <translation type="obsolete">Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation>Azul:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Azul:</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation>Escolha cor</translation>
+        <translation type="obsolete">Escolha cor</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
-        <source>FileDialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open</source>
-        <translation>Abrir</translation>
+        <translation type="obsolete">Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Gravar</translation>
+        <translation type="obsolete">Gravar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
-        <translation>Documentos</translation>
+        <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation>Ficheiros</translation>
+        <translation type="obsolete">Ficheiros</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation>Todos os Ficheiros</translation>
+        <translation type="obsolete">Todos os Ficheiros</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Todos</translation>
+        <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nome:</translation>
+        <translation type="obsolete">Nome:</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Gravar</translation>
+        <translation type="obsolete">&amp;Gravar</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
-        <translation>C&amp;ancelar</translation>
+        <translation type="obsolete">C&amp;ancelar</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamanho</translation>
+        <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ser Permission</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Data</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Apagar</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Apagar</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sim</translation>
+        <translation type="obsolete">Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Não</translation>
+        <translation type="obsolete">Não</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation>Grande</translation>
+        <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Médio</translation>
+        <translation type="obsolete">Médio</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation>Pequeno</translation>
+        <translation type="obsolete">Pequeno</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Size</source>
+        <translation type="obsolete">Tamanho</translation>
+    </message>
+</context>
+<context>
+    <name>ORecurranceBase</name>
+    <message>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
-        <translation type="unfinished">Tamanho</translation>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>End On:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
-        <translation>Sumário:</translation>
+        <translation type="obsolete">Sumário:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Descrição:</translation>
+        <translation type="obsolete">Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Prioridade:</translation>
+        <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Progresso:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Progresso:</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Categoria:</translation>
+        <translation type="obsolete">Categoria:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqdvorak.ts b/i18n/pt/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/pt/libqdvorak.ts
+++ b/i18n/pt/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqhandwriting.ts b/i18n/pt/libqhandwriting.ts
index 00fd9e8..2017ade 100644
--- a/i18n/pt/libqhandwriting.ts
+++ b/i18n/pt/libqhandwriting.ts
@@ -1,132 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Treino</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Parecido com:</translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Novo...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqjumpx.ts b/i18n/pt/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/pt/libqjumpx.ts
+++ b/i18n/pt/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqkeyboard.ts b/i18n/pt/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/pt/libqkeyboard.ts
+++ b/i18n/pt/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqkjumpx.ts b/i18n/pt/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/pt/libqkjumpx.ts
+++ b/i18n/pt/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index 16d183a..9bcd648 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -56,409 +56,389 @@
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorias Aqui</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Há outra aplicação a editar
 as categorias.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorias</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>View</source>
         <translation type="obsolete">Ver</translation>
     </message>
     <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished">Procurar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation type="obsolete">&amp;Procurar</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
         <translation>Copia de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished">Disco</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentário:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Password</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished">Sem Espaço</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
@@ -767,137 +747,153 @@ Free some memory and try again.</source>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqpickboard.ts b/i18n/pt/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/pt/libqpickboard.ts
+++ b/i18n/pt/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqunikeyboard.ts b/i18n/pt/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/pt/libqunikeyboard.ts
+++ b/i18n/pt/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libtheme.ts b/i18n/pt/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/pt/libtheme.ts
+++ b/i18n/pt/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/light-and-power.ts b/i18n/pt/light-and-power.ts
index be40e99..d42f5c2 100644
--- a/i18n/pt/light-and-power.ts
+++ b/i18n/pt/light-and-power.ts
@@ -1,53 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Calibration</name>
+    <message>
+        <source>%1 Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Adjust to environment</source>
-        <translation>Ajustar ao ambiente</translation>
+        <translation type="obsolete">Ajustar ao ambiente</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>A luz do ecrâ será ajustada automaticamente mediante a luz ambiente. O parametro do brilho afectará o brilho médio.</translation>
     </message>
     <message>
         <source>Power saving</source>
-        <translation>Poupança de energia</translation>
+        <translation type="obsolete">Poupança de energia</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>segundos</translation>
+        <translation type="obsolete">segundos</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Reduzir brilho ao fim de</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender ao fim de</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
-        <translation>Desactivar o LCD apenas ao suspender</translation>
+        <translation type="obsolete">Desactivar o LCD apenas ao suspender</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Desligar luz ao fim de</translation>
     </message>
     <message>
         <source>Bright</source>
-        <translation>Brilho</translation>
+        <translation type="obsolete">Brilho</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
-        <translation>&lt;blockquote&gt;Gastará mais bateria quanto mais brilhante seja o ecrâ.&lt;/blockquote&gt;</translation>
+        <translation type="obsolete">&lt;blockquote&gt;Gastará mais bateria quanto mais brilhante seja o ecrâ.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished">Desligar</translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/mediummount.ts b/i18n/pt/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/pt/mediummount.ts
+++ b/i18n/pt/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/opieplayer.ts b/i18n/pt/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/pt/opieplayer.ts
+++ b/i18n/pt/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/oxygen.ts b/i18n/pt/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/pt/oxygen.ts
+++ b/i18n/pt/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 998a3e9..f5fee68 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>A sincronizar</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/sheetqt.ts b/i18n/pt/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/pt/sheetqt.ts
+++ b/i18n/pt/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/showimg.ts b/i18n/pt/showimg.ts
index ce6be16..9d7fd8c 100644
--- a/i18n/pt/showimg.ts
+++ b/i18n/pt/showimg.ts
@@ -1,123 +1,158 @@
 <!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>Leitor Imagens</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Virar Horizontalmente</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Virar Verticalmente</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rodar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rodar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Leitor Imagens</translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></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">Rodar 270º</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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/systemtime.ts b/i18n/pt/systemtime.ts
index 4a6c32f..a984e76 100644
--- a/i18n/pt/systemtime.ts
+++ b/i18n/pt/systemtime.ts
@@ -1,80 +1,266 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SetDateTime</name>
     <message>
         <source>Set System Time</source>
-        <translation>Hora do sistema</translation>
+        <translation type="obsolete">Hora do sistema</translation>
     </message>
     <message>
         <source>Time Zone</source>
         <translation>Fuso Horário</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time format</source>
         <translation>Formato da Hora</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 Horas</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 Horas</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Semana começa em</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Formato da data</translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation>Formato da Hora</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/D hh:mm</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/textedit.ts b/i18n/pt/textedit.ts
index 4780eed..79bf6e2 100644
--- a/i18n/pt/textedit.ts
+++ b/i18n/pt/textedit.ts
@@ -1,308 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</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>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Style</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</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>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unnamed</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</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>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/pt/today.ts b/i18n/pt/today.ts
index 176e504..3abd8b3 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -1,174 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</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="obsolete">&lt;b&gt;%1&lt;/b&gt; novo(s) email(s), &lt;b&gt;%2&lt;/b&gt; na caixa de saída</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="obsolete">Existe &lt;b&gt; 1&lt;/b&gt; tarefa activa: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="obsolete">Existem &lt;b&gt; %1&lt;/b&gt; tarefas activas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="obsolete">Não existem tarefas activas</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="obsolete">Não existem eventos hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>De</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Deve preencher o cartão de visita</translation>
     </message>
     <message>
-        <source>No more appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="obsolete">O OpieMail não está instalado</translation>
     </message>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Hoje</translation>
+        <translation type="unfinished">Hoje</translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished">Configuração</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Vários</translation>
     </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="obsolete">Configuração</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="obsolete">Mostrar
 localização?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="obsolete">Mostrar
 notas?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="obsolete">Mostrar apenas
 os últimos eventos</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="obsolete">Calendário</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="obsolete">Mostrar quantas 
 tarefas?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="obsolete">Tarefas</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="obsolete">Cortar ao fim
 de quantas letras</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Vários</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="obsolete">Mostrar quantos
 eventos?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="obsolete">Lançar ao ligar? 
 (Apenas no Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="obsolete">Mostrar ao fim de 
 quantos minutos?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index 9617254..ba92425 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -1,217 +1,616 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>MainWindow</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Nova Tarefa</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation type="unfinished">Ver Tarefa</translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation type="unfinished">Apagar...</translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation type="unfinished">Apagar Todas...</translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">Duplicar</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished">Irradiar</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished">Procurar</translation>
+    </message>
+    <message>
+        <source>Completed tasks</source>
+        <translation type="unfinished">Tarefas Completas</translation>
+    </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished">Mostrar Limite</translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished">Dados</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Categoria</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Opções</translation>
+    </message>
+    <message>
+        <source>Show only over due</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation type="unfinished">Todas as Categoria</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation type="unfinished">Sem espaço</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished">Tarefa</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Não pode editar enquanto sincroniza</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">Vazio</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
-        <translation>Lista Tarefas</translation>
+        <translation type="obsolete">Lista Tarefas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
-        <translation>Nova Tarefa</translation>
+        <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Categoria:</translation>
+        <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Summary:</source>
-        <translation>Sumário:</translation>
+        <translation type="obsolete">Sumário:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
-        <translation>&amp;Completo</translation>
+        <translation type="obsolete">&amp;Completo</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
-        <translation>&amp;Limite</translation>
+        <translation type="obsolete">&amp;Limite</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
-        <translation>1 Jan 2001</translation>
+        <translation type="obsolete">1 Jan 2001</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Prioridade:</translation>
+        <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
-        <translation>1 - Muito Alta</translation>
+        <translation type="obsolete">1 - Muito Alta</translation>
     </message>
     <message>
         <source>2 - High</source>
-        <translation>2 - Alta</translation>
+        <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
-        <translation>3 - Normal</translation>
+        <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
-        <translation>4 - Baixa</translation>
+        <translation type="obsolete">4 - Baixa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
-        <translation>5 - Muito Baixa</translation>
+        <translation type="obsolete">5 - Muito Baixa</translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>C.</source>
+        <translation type="unfinished">C.</translation>
+    </message>
+    <message>
+        <source>Prior.</source>
+        <translation type="unfinished">Pri.</translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished">Limite</translation>
+    </message>
+    <message>
+        <source>Table View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvanced</name>
+    <message>
+        <source>Form2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Postponed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintainer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintain Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Form3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished">1 - Muito Alta</translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished">2 - Alta</translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished">3 - Normal</translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished">4 - Baixa</translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished">5 - Muito Baixa</translation>
+    </message>
+    <message>
+        <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Categoria</translation>
+    </message>
+    <message>
+        <source>Enable Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Lista Tarefas</translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
-        <translation>C.</translation>
+        <translation type="obsolete">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
-        <translation>Pri.</translation>
+        <translation type="obsolete">Pri.</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>Limite</translation>
+        <translation type="obsolete">Limite</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Vazio</translation>
+        <translation type="obsolete">Vazio</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Tudo</translation>
+        <translation type="obsolete">Tudo</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
-        <translation>Tarefa</translation>
+        <translation type="obsolete">Tarefa</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Sem espaço</translation>
-    </message>
-    <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sem espaço</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nova Tarefa</translation>
+        <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Editar Tarefa</translation>
+        <translation type="obsolete">Editar Tarefa</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Ver Tarefa</translation>
+        <translation type="obsolete">Ver Tarefa</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Apagar...</translation>
+        <translation type="obsolete">Apagar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Apagar Todas...</translation>
+        <translation type="obsolete">Apagar Todas...</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Duplicar</translation>
+        <translation type="obsolete">Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Irradiar</translation>
+        <translation type="obsolete">Irradiar</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Procurar</translation>
+        <translation type="obsolete">Procurar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
-        <translation>Tarefas Completas</translation>
+        <translation type="obsolete">Tarefas Completas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
-        <translation>Mostrar Limite</translation>
+        <translation type="obsolete">Mostrar Limite</translation>
     </message>
     <message>
         <source>Fonts</source>
-        <translation>Fontes</translation>
+        <translation type="obsolete">Fontes</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>Dados</translation>
+        <translation type="obsolete">Dados</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Categoria</translation>
+        <translation type="obsolete">Categoria</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Opções</translation>
+        <translation type="obsolete">Opções</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Não pode editar enquanto sincroniza</translation>
+        <translation type="obsolete">Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Todas as Categoria</translation>
+        <translation type="obsolete">Todas as Categoria</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Vazio</translation>
+        <translation type="obsolete">Vazio</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Sem espaço</translation>
-    </message>
-    <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all tasks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sem espaço</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index d4e76f8..5d711c0 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -1,378 +1,492 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Pick</source>
         <translation>Escolha</translation>
     </message>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Primeiro Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail Padrão</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Up</source>
         <translation type="unfinished">P/ Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">P/ Baixo</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished">Organizar Campos de Edição</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished">Selecione a ordem dos campos:</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Mb</source>
-        <translation>Mb</translation>
+        <translation type="obsolete">Mb</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Trabalho</translation>
+        <translation type="obsolete">Trabalho</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>Não há espaço suficiente para criar
+        <translation type="obsolete">Não há espaço suficiente para criar
 os arquivos iniciais necessários.
 Libere algum espaço antes de
 inserir dados!</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossível salvar informação.
 Libere algum espaço e
 tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Sexo</translation>
+        <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatos</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Sobrenome</translation>
+        <translation type="obsolete">Sobrenome</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Organizar Campos de Edição</translation>
+        <translation type="obsolete">Organizar Campos de Edição</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>E-mail Padrão</translation>
+        <translation type="obsolete">E-mail Padrão</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Arquivar Como</translation>
+        <translation type="obsolete">Arquivar Como</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Out of Space</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Sem Espaço</translation>
+        <translation type="obsolete">Sem Espaço</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escrever E-mail Para</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Enviar Registro</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatos - Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import vCard</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>Save all Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OContacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="unfinished">E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation type="unfinished">Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished">Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished">Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished">Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished">Notas</translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished">Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished">Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished">Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished">Escrever Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
@@ -1129,209 +1243,149 @@ Sair assim mesmo?</translation>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</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>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Spouse</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>Work Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Mobile</source>
+        <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuwait</source>
+        <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/checkbook.ts b/i18n/pt_BR/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/pt_BR/checkbook.ts
+++ b/i18n/pt_BR/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/citytime.ts b/i18n/pt_BR/citytime.ts
index 60e48f6..0fd5ddc 100644
--- a/i18n/pt_BR/citytime.ts
+++ b/i18n/pt_BR/citytime.ts
@@ -1,52 +1,68 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Mudando Horário</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Restaurar Zona Horária</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Houve um problema ajustando a zona horária %1</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Houve um problema ajustando sua zona horária.Sua hora pode ficar errada agora...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Impossível localizar informações sobre zona horária</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Impossível localizar informações sobre zona horária %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Não foi Possível Localizar o Mapa</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;Não pude carregar o mapa: %1, saindo</translation>
     </message>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/embeddedkonsole.ts b/i18n/pt_BR/embeddedkonsole.ts
index ec4baad..07aad1c 100644
--- a/i18n/pt_BR/embeddedkonsole.ts
+++ b/i18n/pt_BR/embeddedkonsole.ts
@@ -98,116 +98,124 @@
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished">Entre comando a adicionar:</translation>
     </message>
     <message>
         <source>Add command</source>
         <translation type="unfinished">Adicionar comando</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/keypebble.ts b/i18n/pt_BR/keypebble.ts
index 7a007dd..a8686ba 100644
--- a/i18n/pt_BR/keypebble.ts
+++ b/i18n/pt_BR/keypebble.ts
@@ -53,189 +53,233 @@ a conexão.</translation>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Erro: Versão do servidor inválida, %1</translation>
     </message>
     <message>
         <source>Waiting for server version...</source>
         <translation>Aguardando por versão do servidor...</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Login Falhou</translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>A senha especificada estava incorreta.</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Muitas Falhas</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Erro: Muitas tentativas inválidas de login foram feitas
 nesta conta. Por favor tente mais tarde.</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Conectado</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Erro: Versão do servidor não suportada, %1</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Erro: Este servidor requer uma senha, mas nenhuma foi especificada.
 </translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>Connected to remote host</source>
         <translation>Conectado ao computador remoto</translation>
     </message>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Viewer</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Tela Cheia</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Sair da tela cheia</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Conectado ao computador remoto</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexão fechada</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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">Senha:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation type="unfinished">Nome do Computador:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation type="unfinished">Número da Tela:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation type="unfinished">Verificar atualizações da tela a cada:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation type="unfinished">Milisegundos</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation type="unfinished">Requisitar sessão 8-bits</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished">Trazer para frente com campainha</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation type="unfinished">Requisitar sessão compartilhada</translation>
     </message>
     <message>
         <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">Codificação Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation type="unfinished">Codificação CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation type="unfinished">RRE encoding</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished">Codificação copia de retângulo</translation>
     </message>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/kpacman.ts b/i18n/pt_BR/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/pt_BR/kpacman.ts
+++ b/i18n/pt_BR/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/language.ts b/i18n/pt_BR/language.ts
index cc2ca25..9611abe 100644
--- a/i18n/pt_BR/language.ts
+++ b/i18n/pt_BR/language.ts
@@ -1,14 +1,25 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Select language</source>
         <translation type="unfinished">Seleção de Linguagem</translation>
     </message>
     <message>
         <source>Language</source>
         <translation type="unfinished">Linguagem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libliquid.ts b/i18n/pt_BR/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/pt_BR/libliquid.ts
+++ b/i18n/pt_BR/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/pt_BR/libmetal.ts b/i18n/pt_BR/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/pt_BR/libmetal.ts
+++ b/i18n/pt_BR/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopie.ts b/i18n/pt_BR/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/pt_BR/libopie.ts
+++ b/i18n/pt_BR/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libqdvorak.ts b/i18n/pt_BR/libqdvorak.ts
index a5e2858..a128522 100644
--- a/i18n/pt_BR/libqdvorak.ts
+++ b/i18n/pt_BR/libqdvorak.ts
@@ -1,3 +1,10 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libqhandwriting.ts b/i18n/pt_BR/libqhandwriting.ts
index 0221061..77e30f4 100644
--- a/i18n/pt_BR/libqhandwriting.ts
+++ b/i18n/pt_BR/libqhandwriting.ts
@@ -1,136 +1,170 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Tips</source>
         <translation>Dicas</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Treinador</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;Ao iniciar o uso do reconhecedor de escrita escreva devagar, precisa e firmemente.&lt;li&gt;Use as linhas guias ao desenhar seus caracteres.&lt;li&gt;Ao desenhar caracteres com múltiplas linhas, cada traço deve ser desenhado antes que os anteriores apaguem.&lt;li&gt;Pratique sua escrita usando o treinador de escrita.&lt;li&gt;Ao adicionar seu próprio modelo de caractere certifique-se de que ele seja suficientemente diferente dos demais.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Handwriting Help</source>
         <translation>Ajuda da Escrita</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
     <message>
         <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation>Selecione um caractere da lista. A área de escrita na esquerda mostra o caractere de referência. Pratique a escrita na área da direita.</translation>
+        <translation type="obsolete">Selecione um caractere da lista. A área de escrita na esquerda mostra o caractere de referência. Pratique a escrita na área da direita.</translation>
     </message>
     <message>
         <source>Matched: </source>
         <translation>Combinou: </translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Semelhante a: </translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>Add</source>
         <translation>Ad.</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpa</translation>
     </message>
     <message>
         <source>New...</source>
         <translation>Novo...</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remove</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Padrão</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Entre o novo caractere</translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished">Áreas de entrada exibidas</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished">Área p/ minúsculas e maiúsculas</translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished">Tempo limite p/ caractere multi-linha</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished">Minúsculas (ligar Maiúsculas)</translation>
     </message>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossível salvar informação.
 Libere algum espaço e
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Configurar Entrada por Escrita</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Perfil de Caractere:</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libqjumpx.ts b/i18n/pt_BR/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/pt_BR/libqjumpx.ts
+++ b/i18n/pt_BR/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libqkeyboard.ts b/i18n/pt_BR/libqkeyboard.ts
index a5e2858..c06f4fd 100644
--- a/i18n/pt_BR/libqkeyboard.ts
+++ b/i18n/pt_BR/libqkeyboard.ts
@@ -1,3 +1,10 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libqkjumpx.ts b/i18n/pt_BR/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/pt_BR/libqkjumpx.ts
+++ b/i18n/pt_BR/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index 75798b6..525a3ac 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -196,270 +196,270 @@ editando as categorias.</translation>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Seqüência não encontrada.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Fim atingido, reiniciando a partir do início</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished">Localizar</translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation type="obsolete">&amp;Localizar</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished">Começar procura em:</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished">Procurar p/ trás</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished">Localizar:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished">Categoria:</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished">Sensível a caixa</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>File deletion failed.</source>
         <translation>Remoção de arquivo falhou.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Cópia de </translation>
     </message>
     <message>
         <source>Icon deletion failed.</source>
         <translation type="obsolete">Remoção de ícone falhou.</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicata</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Cópia de arquivos falhou.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Delete Icon and leave file</source>
         <translation type="obsolete">Apagar ícone e deixar arquivo</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Falhou ao mover Documento.</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Visualizador de Documentos</translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished">Disco Rígido</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Enviar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished">Copia</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished">Tipo:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished">Carregamento rápido (consome memória)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished">Comentário:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished">Localização</translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished">Detalhes</translation>
     </message>
     <message>
         <source>Del Icon</source>
         <translation type="obsolete">Rem. Ícone</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informações sobre o Proprietário</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished">Entre a senha</translation>
     </message>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Y</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
@@ -777,138 +777,154 @@ tente novamente.</translation>
     <message>
         <source>Birthday</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniv. de Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Crianças</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco Rígido SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossível agendar alarme.
 Por Favor libere algum espaço e tente novamente</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libqpickboard.ts b/i18n/pt_BR/libqpickboard.ts
index a5e2858..3eabf95 100644
--- a/i18n/pt_BR/libqpickboard.ts
+++ b/i18n/pt_BR/libqpickboard.ts
@@ -1,3 +1,10 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libqunikeyboard.ts b/i18n/pt_BR/libqunikeyboard.ts
index a5e2858..18f5e45 100644
--- a/i18n/pt_BR/libqunikeyboard.ts
+++ b/i18n/pt_BR/libqunikeyboard.ts
@@ -1,3 +1,10 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libtheme.ts b/i18n/pt_BR/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/pt_BR/libtheme.ts
+++ b/i18n/pt_BR/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/light-and-power.ts b/i18n/pt_BR/light-and-power.ts
index 001691b..5c8afc4 100644
--- a/i18n/pt_BR/light-and-power.ts
+++ b/i18n/pt_BR/light-and-power.ts
@@ -1,54 +1,168 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Calibration</name>
+    <message>
+        <source>%1 Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Off</source>
         <translation type="unfinished">Desligada</translation>
     </message>
     <message>
         <source>Power saving</source>
-        <translation type="unfinished">Conservação de enegria</translation>
+        <translation type="obsolete">Conservação de enegria</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">&lt;blockquote&gt;Quanto mais clara a luz mais bateria será usada.&lt;/blockquote&gt;</translation>
+        <translation type="obsolete">&lt;blockquote&gt;Quanto mais clara a luz mais bateria será usada.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished">Apagar luz após</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">Detectando a luz ambiente do local onde você está usando o dispositivo a iluminação pode ser ajustada automaticamente. A configuração de brilho ainda afeta a média de blilho.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished">Diminuir a luz após</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"> segundos</translation>
+        <translation type="obsolete"> segundos</translation>
     </message>
     <message>
         <source>Adjust to environment</source>
-        <translation type="unfinished">Ajustar ao meio-ambiente</translation>
+        <translation type="obsolete">Ajustar ao meio-ambiente</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished">Suspender após</translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>on Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mediummount.ts b/i18n/pt_BR/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/pt_BR/mediummount.ts
+++ b/i18n/pt_BR/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opieplayer.ts b/i18n/pt_BR/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/pt_BR/opieplayer.ts
+++ b/i18n/pt_BR/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/oxygen.ts b/i18n/pt_BR/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/pt_BR/oxygen.ts
+++ b/i18n/pt_BR/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index ecf227f..9205a6c 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -1,18 +1,245 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Contatos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Syncing</source>
         <translation type="unfinished">Sincronizando</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/sheetqt.ts b/i18n/pt_BR/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/pt_BR/sheetqt.ts
+++ b/i18n/pt_BR/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/showimg.ts b/i18n/pt_BR/showimg.ts
index 4345f13..c68112d 100644
--- a/i18n/pt_BR/showimg.ts
+++ b/i18n/pt_BR/showimg.ts
@@ -1,124 +1,159 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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>Visualizador de Imagens</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Cores reais</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Giro vertical</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Giro horizontal</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>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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/sound.ts b/i18n/pt_BR/sound.ts
index 33d9410..1b47297 100644
--- a/i18n/pt_BR/sound.ts
+++ b/i18n/pt_BR/sound.ts
@@ -1,133 +1,129 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>SoundSettings</name>
     <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>Stereo</source>
         <translation type="unfinished">Estéreo</translation>
     </message>
     <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>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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/systemtime.ts b/i18n/pt_BR/systemtime.ts
index 6c5a289..56db29c 100644
--- a/i18n/pt_BR/systemtime.ts
+++ b/i18n/pt_BR/systemtime.ts
@@ -1,81 +1,267 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SetDateTime</name>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Semana começa no(a)</translation>
     </message>
     <message>
         <source>Time Zone</source>
         <translation>Zona Horária</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 horas</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 horas</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Formato de data</translation>
     </message>
     <message>
         <source>Time format</source>
         <translation>Formato de hora</translation>
     </message>
     <message>
         <source>Set System Time</source>
-        <translation>Ajustar horário do Sistema</translation>
+        <translation type="obsolete">Ajustar horário do Sistema</translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuto</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/textedit.ts b/i18n/pt_BR/textedit.ts
index 3082c8d..e3b1119 100644
--- a/i18n/pt_BR/textedit.ts
+++ b/i18n/pt_BR/textedit.ts
@@ -1,309 +1,280 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished">Sem Nome</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished">Editor de Texto</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
     <message>
         <source>Font</source>
         <translation type="obsolete">Fonte</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
     <message>
         <source>Font Dialog</source>
         <translation type="obsolete">Diálogo de Fontes</translation>
     </message>
     <message>
         <source>Font Style</source>
         <translation type="obsolete">Estilo da Fonte</translation>
     </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="obsolete">Negrito</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Aproximar</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Quebrar linhas</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Localizar Próx.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor de Texto</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="obsolete">Itálico</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Afastar</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Localização</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Salvar Como</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="obsolete">Sem Nome</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Localizar...</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Iniciar com novo arquivo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>About</source>
         <translation type="unfinished"></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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Dono</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>dono</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Ajustar Permissões de Arquivo</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ajustar permissões de arquivo para:</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/pt_BR/today.ts b/i18n/pt_BR/today.ts
index a23a27f..16eb8be 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -1,174 +1,195 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</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="obsolete">&lt;b&gt;%1&lt;/b&gt; nova(s) mensagem(ns), &lt;b&gt;%2&lt;/b&gt; saída</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="obsolete">Existem &lt;b&gt; 1&lt;/b&gt; tarefas ativas:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="obsolete">Existem &lt;b&gt; %1&lt;/b&gt; tarefas ativas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="obsolete">Nenhuma tarefa ativa</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="obsolete">Nenhum compromisso hoje</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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="obsolete">Opiemail não instalado</translation>
     </message>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Hoje</translation>
+        <translation type="unfinished">Hoje</translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished">Configuração do Hoje</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Misc</translation>
     </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="obsolete">Quantas
 tarefas devem 
 ser mostradas ?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="obsolete">Tarefas</translation>
     </message>
     <message>
         <source>Today config</source>
         <translation type="obsolete">Configuração do Hoje</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="obsolete">As notas devem 
 ser mostradas ?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="obsolete">Mostrar apenas
 compr. atrasados</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="obsolete">Calendário</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="obsolete">A localização 
 deve ser 
 mostrada ?</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="obsolete">Truncar após
 quantas letras</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Misc</translation>
     </message>
-    <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index ef815f7..7e5a94f 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -1,225 +1,592 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>MainWindow</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Nova Tarefa</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished">Enviar</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished">Localizar</translation>
+    </message>
+    <message>
+        <source>Completed tasks</source>
+        <translation type="unfinished">Tarefas completadas</translation>
+    </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show only over due</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation type="unfinished">Sem Espaço</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished">Tarefas não pode
+salvar suas mudanças.
+Libere algum espaço
+e tente novamente.
+
+Sair assim mesmo ?</translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished">Tarefas</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Impossível editar dados durante sincronização</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
-        <translation>Lista de Tarefas</translation>
+        <translation type="obsolete">Lista de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>D&amp;ue</source>
-        <translation type="unfinished">&amp;Prazo</translation>
+        <translation type="obsolete">&amp;Prazo</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation type="unfinished">Prioridade:</translation>
+        <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>2 - High</source>
-        <translation type="unfinished">2 - Alta</translation>
+        <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
-        <translation type="unfinished">&amp;Completada</translation>
+        <translation type="obsolete">&amp;Completada</translation>
     </message>
     <message>
         <source>3 - Normal</source>
-        <translation type="unfinished">3 - Normal</translation>
+        <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
-        <translation type="unfinished">4 - Baixa</translation>
+        <translation type="obsolete">4 - Baixa</translation>
     </message>
     <message>
         <source>1 - Very High</source>
-        <translation type="unfinished">1 - Muito Alta</translation>
+        <translation type="obsolete">1 - Muito Alta</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished">Categoria:</translation>
+        <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation type="unfinished">Nova Tarefa</translation>
+        <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
-        <translation type="unfinished">5 - Muito Baixa</translation>
+        <translation type="obsolete">5 - Muito Baixa</translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>C.</source>
+        <translation type="unfinished">C.</translation>
+    </message>
+    <message>
+        <source>Prior.</source>
+        <translation type="unfinished">Prior.</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Table View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvanced</name>
+    <message>
+        <source>Form2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Postponed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintainer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Responsible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Form3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished">1 - Muito Alta</translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished">2 - Alta</translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished">3 - Normal</translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished">4 - Baixa</translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished">5 - Muito Baixa</translation>
+    </message>
+    <message>
+        <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Lista de Tarefas</translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
-        <translation>C.</translation>
+        <translation type="obsolete">C.</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Todas</translation>
+        <translation type="obsolete">Todas</translation>
     </message>
     <message>
         <source>Prior.</source>
-        <translation>Prior.</translation>
+        <translation type="obsolete">Prior.</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Não preenchida</translation>
-    </message>
-    <message>
-        <source>Deadline</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Não preenchida</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Beam</source>
-        <translation>Enviar</translation>
+        <translation type="obsolete">Enviar</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Localizar</translation>
+        <translation type="obsolete">Localizar</translation>
     </message>
     <message>
         <source>Todo</source>
-        <translation>Tarefas</translation>
+        <translation type="obsolete">Tarefas</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Editar Tarefa</translation>
+        <translation type="obsolete">Editar Tarefa</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
-        <translation>Impossível criar arquivos iniciais
+        <translation type="obsolete">Impossível criar arquivos iniciais
 Libere algum espaço
 antes de inserir dados</translation>
     </message>
     <message>
         <source>Completed tasks</source>
-        <translation>Tarefas completadas</translation>
+        <translation type="obsolete">Tarefas completadas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Impossível editar dados durante sincronização</translation>
+        <translation type="obsolete">Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>Tarefas não pode
+        <translation type="obsolete">Tarefas não pode
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Não preenchido</translation>
+        <translation type="obsolete">Não preenchido</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Nova Tarefa</translation>
+        <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Sem Espaço</translation>
+        <translation type="obsolete">Sem Espaço</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Sem Espaço</translation>
-    </message>
-    <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Deadline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fonts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all tasks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sem Espaço</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index abdeb78..6b2d2cc 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -15,364 +15,482 @@
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Brez</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation>Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Privzeta epošta</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Opombe</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Uredi urejevalna polja</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Izberi zaporedje polj:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Pošlji epošto</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Prežarči vnos</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
-        <translation>Uredi urejevalna polja</translation>
+        <translation type="obsolete">Uredi urejevalna polja</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Zmanjkalo je prostora</translation>
+        <translation type="obsolete">Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
-        <translation>Ni dovolj prostora za potrebne
+        <translation type="obsolete">Ni dovolj prostora za potrebne
 zagonske datoteke.
 
 Sprostite nekaj prostora preden
 vnesete podatke!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urejati podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Uredi moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Uredi naslov</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Stiki - Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Ne morem shraniti informacije.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Naziv</translation>
+        <translation type="obsolete">Naziv</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Zapiski</translation>
+        <translation type="obsolete">Zapiski</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Služba</translation>
+        <translation type="obsolete">Služba</translation>
     </message>
     <message>
         <source>Mb</source>
-        <translation>Mobitel</translation>
+        <translation type="obsolete">Mobitel</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Ime</translation>
+        <translation type="obsolete">Ime</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Priimek</translation>
+        <translation type="obsolete">Priimek</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Datoteka kot</translation>
+        <translation type="obsolete">Datoteka kot</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Privzeta epošta</translation>
+        <translation type="obsolete">Privzeta epošta</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Spol</translation>
+        <translation type="obsolete">Spol</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Mala</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velika</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Uvozi vCard</translation>
     </message>
+    <message>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save all Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OContacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation>Privzeta epošta</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Epošta</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Naziv</translation>
+        <translation type="obsolete">Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Delovno mesto</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Podjetje</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Zapiski</translation>
+        <translation type="obsolete">Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation>Skupine</translation>
+        <translation type="obsolete">Skupine</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Mesto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Pokrajina</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Država</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Polno ime...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Zapiski...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Službeno</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Naslov</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Poštna številka</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Združene države</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Velika Britanija</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japonska</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francija</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Nemčija</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norveška</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženski</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Vpišite zapiske</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Uredi ime</translation>
@@ -1130,208 +1248,212 @@ Izhod?</translation>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukrajina</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Urugvaj</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation>Viet Nam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Deviški Otoki</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Zahodna Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavija</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambija</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabve</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Službeni faks</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Domači faks</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Službeni telefon</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Domači telefon</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Službeni mobitel</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Domači mobitel</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Službena spletna stran</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domača spletna stran</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Službeni pozivnik</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Ulica podjetja</translation>
+        <translation type="obsolete">Ulica podjetja</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Domača ulica</translation>
+        <translation type="obsolete">Domača ulica</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Mesto podjetja</translation>
+        <translation type="obsolete">Mesto podjetja</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Okrožje podjetja</translation>
+        <translation type="obsolete">Okrožje podjetja</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Poštna št. podjetja</translation>
+        <translation type="obsolete">Poštna št. podjetja</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Država podjetja</translation>
+        <translation type="obsolete">Država podjetja</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Domače mesto</translation>
+        <translation type="obsolete">Domače mesto</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Domače okrožje</translation>
+        <translation type="obsolete">Domače okrožje</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Domača poštna številka</translation>
+        <translation type="obsolete">Domača poštna številka</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Domača država</translation>
+        <translation type="obsolete">Domača država</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Oddelek</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Poklic</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Pomočnik</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Upravnik</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Zakonec</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Otroci</translation>
     </message>
     <message>
         <source>Work Phone</source>
-        <translation>Službeni telefon</translation>
+        <translation type="obsolete">Službeni telefon</translation>
     </message>
     <message>
         <source>Work Fax</source>
-        <translation>Službeni faks</translation>
+        <translation type="obsolete">Službeni faks</translation>
     </message>
     <message>
         <source>work Mobile</source>
-        <translation>službeni mobitel</translation>
+        <translation type="obsolete">službeni mobitel</translation>
     </message>
     <message>
         <source>Work Pager</source>
-        <translation>Službeni pozivnik</translation>
+        <translation type="obsolete">Službeni pozivnik</translation>
     </message>
     <message>
         <source>Work Web Page</source>
-        <translation>Službena spletna stran</translation>
+        <translation type="obsolete">Službena spletna stran</translation>
     </message>
     <message>
         <source>Work Mobile</source>
-        <translation>Službeni mobitel</translation>
+        <translation type="obsolete">Službeni mobitel</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuvajt</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation>Kyrgystan</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 11f4664..c015cb6 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -29,235 +29,239 @@
         <source>Run Command</source>
         <translation>Poženi ukaz</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Poženi ukaz z izhodom</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Preklopi na lokalen</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Preklopi na oddaljen</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati
 
 </translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Opomba</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Ne morem preimenovati</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ta imenik ne obstaja</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Prekopiraj kot</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Izhod iz programa</translation>
     </message>
     <message>
         <source>command failed!</source>
         <translation>ukaz spodletel!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Vredu</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Prežarči ven</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir poslan.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="obsolete">Zamenjaj imenik</translation>
+        <translation type="unfinished">Zamenjaj imenik</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Izvrši</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Odpri kot besedilo</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Ustvari povezavo</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Prestavi</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Informacije o datoteki</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Nastavi pravice</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Prežarči datoteko</translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation>že obstaja.
 Ali jo res želite izbrisati?</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Kot</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiraj isti imenik</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Ne morem kopirati</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>v
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Ne morem prenesti
 </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>Advanced FileManager
 pravice pridržane 2002
 LJ.Potter&lt;llornkcor@handhelds.org&gt;
 in je licencirano pod GPL</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Dodaj med dokumente</translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Shrani izhod v datoteko (samo ime)</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/checkbook.ts b/i18n/sl/checkbook.ts
index 303c47f..1a57289 100644
--- a/i18n/sl/checkbook.ts
+++ b/i18n/sl/checkbook.ts
@@ -1,300 +1,719 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Checkbook</name>
+    <message>
+        <source>Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transactions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter name of checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished">Tip:</translation>
+    </message>
+    <message>
+        <source>Select type of checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bank:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter name of the bank for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Account number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter account number for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PIN number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter PIN number for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting balance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the initial balance for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this checkbook here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current balance: %10.00</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area shows the current balance in this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add a new transaction.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a transaction and then click here to edit it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here to delete it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the desired chart below and then click on the Draw button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the desired chart type.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Account balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Withdrawals by category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deposits by category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to draw the selected chart.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current balance: %1%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete transaction</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all checkbooks currently available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
-        <translation>Podrobnosti transakcije</translation>
+        <translation type="obsolete">Podrobnosti transakcije</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
-        <translation>Avto</translation>
+        <translation type="obsolete">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Račun</translation>
+        <translation type="obsolete">Račun</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDji</translation>
+        <translation type="obsolete">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Oblačila</translation>
+        <translation type="obsolete">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Računalnik</translation>
+        <translation type="obsolete">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDji</translation>
+        <translation type="obsolete">DVDji</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Elektronika</translation>
+        <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Zabava</translation>
+        <translation type="obsolete">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Hrana</translation>
+        <translation type="obsolete">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Bencin</translation>
+        <translation type="obsolete">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Različno</translation>
+        <translation type="obsolete">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Filmi</translation>
+        <translation type="obsolete">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Najem</translation>
+        <translation type="obsolete">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Potovanje</translation>
+        <translation type="obsolete">Potovanje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation>Dolg</translation>
+        <translation type="obsolete">Dolg</translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation>Ček</translation>
+        <translation type="obsolete">Ček</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation>Prenos</translation>
+        <translation type="obsolete">Prenos</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation>Kreditna kartica</translation>
+        <translation type="obsolete">Kreditna kartica</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Delo</translation>
+        <translation type="obsolete">Delo</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Član družine</translation>
+        <translation type="obsolete">Član družine</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Različni krediti</translation>
+        <translation type="obsolete">Različni krediti</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
-        <translation>Avtomatsko plačilo</translation>
+        <translation type="obsolete">Avtomatsko plačilo</translation>
     </message>
     <message>
         <source>Cash</source>
-        <translation>Gotovina</translation>
+        <translation type="obsolete">Gotovina</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntryBase</name>
     <message>
         <source>Account Transaction</source>
-        <translation>Transakcija računa</translation>
+        <translation type="obsolete">Transakcija računa</translation>
     </message>
     <message>
         <source>$</source>
-        <translation>SIT</translation>
+        <translation type="obsolete">SIT</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Kategorija:</translation>
+        <translation type="obsolete">Kategorija:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Opis:</translation>
+        <translation type="obsolete">Opis:</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation>Tip:</translation>
+        <translation type="obsolete">Tip:</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Količina:</translation>
+        <translation type="obsolete">Količina:</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Avto</translation>
+        <translation type="obsolete">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Računi</translation>
+        <translation type="obsolete">Računi</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDji</translation>
+        <translation type="obsolete">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Oblačila</translation>
+        <translation type="obsolete">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Računalnik</translation>
+        <translation type="obsolete">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDji</translation>
+        <translation type="obsolete">DVDji</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Elektronika</translation>
+        <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Zabava</translation>
+        <translation type="obsolete">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Hrana</translation>
+        <translation type="obsolete">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Bencin</translation>
+        <translation type="obsolete">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Različno</translation>
+        <translation type="obsolete">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Filmi</translation>
+        <translation type="obsolete">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Najem</translation>
+        <translation type="obsolete">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Potovanje</translation>
+        <translation type="obsolete">Potovanje</translation>
     </message>
     <message>
         <source>Check Number:</source>
-        <translation>Številka čeka:</translation>
+        <translation type="obsolete">Številka čeka:</translation>
     </message>
     <message>
         <source>Extra Fee:</source>
-        <translation>Dodaten honorar:</translation>
+        <translation type="obsolete">Dodaten honorar:</translation>
     </message>
     <message>
         <source>Additional Notes:</source>
-        <translation>Dodatne opombe:</translation>
+        <translation type="obsolete">Dodatne opombe:</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation>Datum:</translation>
+        <translation type="obsolete">Datum:</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation>Dolg</translation>
+        <translation type="obsolete">Dolg</translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation>Ček</translation>
+        <translation type="obsolete">Ček</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation>Prenos</translation>
+        <translation type="obsolete">Prenos</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation>Kreditna kartica</translation>
+        <translation type="obsolete">Kreditna kartica</translation>
     </message>
     <message>
         <source>Deposit</source>
-        <translation>Depozit</translation>
+        <translation type="obsolete">Depozit</translation>
     </message>
     <message>
         <source>Payment</source>
-        <translation>Plačilo</translation>
+        <translation type="obsolete">Plačilo</translation>
     </message>
 </context>
 <context>
     <name>QCheckGraphBase</name>
     <message>
         <source>Account Graph</source>
-        <translation>Graf računa</translation>
+        <translation type="obsolete">Graf računa</translation>
     </message>
 </context>
 <context>
     <name>QCheckMMBase</name>
     <message>
         <source>Main Menu</source>
-        <translation>Glavni menu</translation>
+        <translation type="obsolete">Glavni menu</translation>
     </message>
     <message>
         <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
-        <translation>Izberite iz čekovne knjižice spodaj ali kliknite &quot;Nov&quot; ikono na orodni vrstici.</translation>
+        <translation type="obsolete">Izberite iz čekovne knjižice spodaj ali kliknite &quot;Nov&quot; ikono na orodni vrstici.</translation>
     </message>
 </context>
 <context>
     <name>QCheckNameBase</name>
     <message>
         <source>Check Book Name</source>
-        <translation>Ime čekovne knjižice</translation>
+        <translation type="obsolete">Ime čekovne knjižice</translation>
     </message>
     <message>
         <source>Name...</source>
-        <translation>Ime...</translation>
+        <translation type="obsolete">Ime...</translation>
     </message>
     <message>
         <source>Please name your check book (limit: 15 characters):</source>
-        <translation>Prosim imenujte vašo čekovno knjižico (15 znakov):</translation>
+        <translation type="obsolete">Prosim imenujte vašo čekovno knjižico (15 znakov):</translation>
     </message>
     <message>
         <source>&amp;Done</source>
-        <translation>&amp;Narejeno</translation>
+        <translation type="obsolete">&amp;Narejeno</translation>
     </message>
 </context>
 <context>
     <name>QCheckViewBase</name>
     <message>
         <source>Account Transactions</source>
-        <translation>Transakcija računa</translation>
+        <translation type="obsolete">Transakcija računa</translation>
     </message>
     <message>
         <source>$0.00</source>
-        <translation>0,00 SIT</translation>
+        <translation type="obsolete">0,00 SIT</translation>
     </message>
     <message>
         <source>Balance:</source>
-        <translation>Stanje:</translation>
+        <translation type="obsolete">Stanje:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
-        <translation>Zmanjkalo prostora</translation>
+        <translation type="obsolete">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
-        <translation>Prišlo je do problema pri kreiranju
+        <translation type="obsolete">Prišlo je do problema pri kreiranju
 nastavitvenih informacij 
 za ta program.
 
 Prosim sprostite nekaj prostora in
 poizkusite ponovno.</translation>
     </message>
 </context>
+<context>
+    <name>Transaction</name>
+    <message>
+        <source>Transaction for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Withdrawal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deposit</source>
+        <translation type="unfinished">Depozit</translation>
+    </message>
+    <message>
+        <source>Date:</source>
+        <translation type="unfinished">Datum:</translation>
+    </message>
+    <message>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter check number here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished">Opis:</translation>
+    </message>
+    <message>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished">Kategorija:</translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished">Tip:</translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished">Količina:</translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Avto</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CDji</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Oblačila</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Računalnik</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVDji</translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished">Elektronika</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Zabava</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Hrana</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Bencin</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Različno</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Filmi</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Najem</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Potovanje</translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished">Dolg</translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished">Ček</translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished">Prenos</translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished">Kreditna kartica</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Delo</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Član družine</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Različni krediti</translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished">Avtomatsko plačilo</translation>
+    </message>
+    <message>
+        <source>Cash</source>
+        <translation type="unfinished">Gotovina</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/citytime.ts b/i18n/sl/citytime.ts
index 9b67f0b..aede3df 100644
--- a/i18n/sl/citytime.ts
+++ b/i18n/sl/citytime.ts
@@ -1,51 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Menjam čas</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Prišlo je do problema pri nastavitvi časovnega pasu %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Ponastavi časovni pas</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Prišlo je do problema pri nastavitvi časovnega pasu. Čas bo mogoče napačen...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Mestni čas</translation>
     </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>MESTO</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Ne najdem informacije o časovnem pasu</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Ne najdem informacije o časovnem pasu %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Ne najdem mape</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;Ne morem naložiti mape: %1, končujem</translation>
     </message>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/embeddedkonsole.ts b/i18n/sl/embeddedkonsole.ts
index c31c8a6..9fde28a 100644
--- a/i18n/sl/embeddedkonsole.ts
+++ b/i18n/sl/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation>Zelena na črni</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Črna na beli</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bela na črni</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Črna na prozorni</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Črna na rdeči</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rdeča na črni</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zelena na rumeni</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Modra na Vijolčni</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Vijolčna na modri</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Svetlo modra na beli</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bela na svetlo modri</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Modra na črni</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber na črni</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Hitro uredi</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Levo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Desno</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Drsnik</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Po izbiri</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Seznam ukazov</translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj ukaz</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Vpiši ukaz, ki naj ga dodam:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/keypebble.ts b/i18n/sl/keypebble.ts
index f4d0776..af3260c 100644
--- a/i18n/sl/keypebble.ts
+++ b/i18n/sl/keypebble.ts
@@ -52,189 +52,233 @@ povezavo.</translation>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Čakam na različico strežnika...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Napaka: Neveljavena različica strežnika, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Napaka: Nepodprta različica strežnika, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Prijavljen</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Napaka: Ta strežnik potrebuje geslo, a nobeno ni bilo podano.
  </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Napaka: Geslo, ki ste ga posredovali ni pravilno.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Napaka: Preveč neveljavnih prijav se je izvršilo
 na ta račun, prosim poizkusite kasneje.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Neuspešna prijava</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Preveč napak</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Pregledovalnik</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Cel zaslon</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Prekini povezavo</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Ustavi cel zaslon</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Povezan z oddaljenim gostiteljem</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Prijavlen v oddaljenega gostitelja</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Povezava prekinjena</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nova povezava</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Odpri zaznamek</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Izbriši zaznamek</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Pošlji Control-Alt-Delete</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Zaznamki</translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>VNC </translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Strežnik</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Prikaži geslo</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Geslo:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Ime zaznamka:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Ime gostitelja:</translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Številka prikazovalnika:</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Izbor</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Posodobi zaslon vsakih:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>milisekund</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>Zahtevaj 8-bitno sejo</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Vstani na zvonec</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Zahtevaj deljeno sejo</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>3</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Faktor povečave</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Kodiranje</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Hextile kodiranje</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRE kodiranje</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>RRE kodiranje</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>Kopiraj pravokotno kodiranje</translation>
     </message>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/kpacman.ts b/i18n/sl/kpacman.ts
index 23c2c5c..c5a9489 100644
--- a/i18n/sl/kpacman.ts
+++ b/i18n/sl/kpacman.ts
@@ -131,137 +131,119 @@ ali pa je v neznani obliki.</translation>
     <message>
         <source>READY!</source>
         <translation>PRIPRAVLJEN!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>USTAVLJEN</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>ZNAK</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>VZDEVEK</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SENCA</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;UTRIPAJOČ&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-HITRI</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;ROŽNAT&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PRITISNI SMERNO TIPKO ZA ZAČETEK</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>NAJVIŠJE TOČKE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>ČESTITAM</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>DOSEGLI STE</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>TOČKE MED 10 NAJBOLJŠIMI.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>USTAVLJENA</translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@.@MM@.@YY@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/language.ts b/i18n/sl/language.ts
index 62c2f57..8b08c3e 100644
--- a/i18n/sl/language.ts
+++ b/i18n/sl/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation>Jezik</translation>
     </message>
     <message>
         <source>Select language</source>
         <translation>Izberi jezik</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libmetal.ts b/i18n/sl/libmetal.ts
index 4e11e4b..0b23d73 100644
--- a/i18n/sl/libmetal.ts
+++ b/i18n/sl/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation>Kovnski</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libopie.ts b/i18n/sl/libopie.ts
index a2188ca..4e93683 100644
--- a/i18n/sl/libopie.ts
+++ b/i18n/sl/libopie.ts
@@ -1,208 +1,299 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
     <message>
         <source>More</source>
-        <translation>Več</translation>
+        <translation type="obsolete">Več</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Več...</translation>
+        <translation type="obsolete">Več...</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
-        <translation>Hue:</translation>
+        <translation type="obsolete">Hue:</translation>
     </message>
     <message>
         <source>Sat:</source>
-        <translation>Sat:</translation>
+        <translation type="obsolete">Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation>Val:</translation>
+        <translation type="obsolete">Val:</translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation>Rdeča:</translation>
+        <translation type="obsolete">Rdeča:</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation>Zelena:</translation>
+        <translation type="obsolete">Zelena:</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation>Modra:</translation>
+        <translation type="obsolete">Modra:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation>Alfa kanal:</translation>
+        <translation type="obsolete">Alfa kanal:</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation>Izberi barvo</translation>
+        <translation type="obsolete">Izberi barvo</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation>DatotečniDialog</translation>
+        <translation type="obsolete">DatotečniDialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Odpri</translation>
+        <translation type="obsolete">Odpri</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Shrani</translation>
+        <translation type="obsolete">Shrani</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Documents</source>
-        <translation>Dokumenti</translation>
+        <translation type="obsolete">Dokumenti</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation>Datoteke</translation>
+        <translation type="obsolete">Datoteke</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation>Vse datoteke</translation>
+        <translation type="obsolete">Vse datoteke</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Vse</translation>
+        <translation type="obsolete">Vse</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Ime:</translation>
+        <translation type="obsolete">Ime:</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Shrani</translation>
+        <translation type="obsolete">&amp;Shrani</translation>
     </message>
     <message>
         <source>C&amp;ancel</source>
-        <translation>P&amp;rekliči</translation>
+        <translation type="obsolete">P&amp;rekliči</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Ime</translation>
+        <translation type="obsolete">Ime</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Velikost</translation>
+        <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation>Datum</translation>
+        <translation type="obsolete">Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation>Mime tip</translation>
+        <translation type="obsolete">Mime tip</translation>
     </message>
     <message>
         <source>Ser Permission</source>
-        <translation>Pravice uporabnika</translation>
+        <translation type="obsolete">Pravice uporabnika</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Izbriši</translation>
+        <translation type="obsolete">Izbriši</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Ali res želite izbrisati
+        <translation type="obsolete">Ali res želite izbrisati
 </translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Da</translation>
+        <translation type="obsolete">Da</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Ne</translation>
+        <translation type="obsolete">Ne</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation>Velika</translation>
+        <translation type="obsolete">Velika</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Srednja</translation>
+        <translation type="obsolete">Srednja</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation>Majhna</translation>
+        <translation type="obsolete">Majhna</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation>Stil</translation>
+        <translation type="obsolete">Stil</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Velikost</translation>
+        <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Hitra rjava lisica skoči čez lenega psa</translation>
+        <translation type="obsolete">Hitra rjava lisica skoči čez lenega psa</translation>
+    </message>
+</context>
+<context>
+    <name>ORecurranceBase</name>
+    <message>
+        <source>Repeating Event </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End On:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation>izbiralecČasa</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Izberi čas:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Summary:</source>
-        <translation>Povzetek:</translation>
+        <translation type="obsolete">Povzetek:</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation>Opis:</translation>
+        <translation type="obsolete">Opis:</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Prednost:</translation>
+        <translation type="obsolete">Prednost:</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Napredovanje:</translation>
+        <translation type="obsolete">Napredovanje:</translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation>Rok:</translation>
+        <translation type="obsolete">Rok:</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Kategorija:</translation>
+        <translation type="obsolete">Kategorija:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libqdvorak.ts b/i18n/sl/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/sl/libqdvorak.ts
+++ b/i18n/sl/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libqhandwriting.ts b/i18n/sl/libqhandwriting.ts
index 502488b..9735ee5 100644
--- a/i18n/sl/libqhandwriting.ts
+++ b/i18n/sl/libqhandwriting.ts
@@ -1,136 +1,170 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>Pomoč za ročno pisanje</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;Ko začnete uporabljati prepoznavalnik pisave pišite počasi, natančno in nežno.&lt;li&gt;Uporabite ta vodič, ko rišete znake.&lt;li&gt;Ko rišete znake z več potegi, vsak poteg more biti izrisan preden so vsi sivi potegi izbrisani.&lt;li&gt;Trenirajte vašo pisavo z uporabo trenerja.&lt;li&gt;Ko dodajate vaše znakovne predloge, preglejte, da so dovolj različne od drugih znakovnih predlog.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Nasveti</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Trener</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation>Izberite znak iz seznama. Na levi imate primer znaka. Na desni strani pa lahko vadite.</translation>
+        <translation type="obsolete">Izberite znak iz seznama. Na levi imate primer znaka. Na desni strani pa lahko vadite.</translation>
     </message>
     <message>
         <source>Matched: </source>
         <translation>Najdeno: </translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Podobno kot: </translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Nov...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Zbriši</translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Vpišite nov znak</translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation>Obrazec1</translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation>Odmor med potegi:</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>Prikazano vhodno območje</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>Velike in male črke</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>Male črke (Velike črke)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Nastavi vhod</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Profil znakov:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Prilagodi</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Ne morem shraniti informacije.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libqjumpx.ts b/i18n/sl/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/sl/libqjumpx.ts
+++ b/i18n/sl/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libqkeyboard.ts b/i18n/sl/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/sl/libqkeyboard.ts
+++ b/i18n/sl/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libqkjumpx.ts b/i18n/sl/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/sl/libqkjumpx.ts
+++ b/i18n/sl/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index b6683f6..5454349 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -273,192 +273,196 @@ ureja kategorije.</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Kopiranje datoteke spodletelo.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Premikanje dokumenta spodletelo.</translation>
     </message>
     <message>
         <source>File does not exist.</source>
         <translation type="obsolete">Datoteka ne obstaja.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished">Trdi disk</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentar:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Hitro nalaganje (vzame nekaj spomin)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Del Icon</source>
         <translation type="obsolete">Izbriši ikono</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informacije o lastniku</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</source>
         <translation>Obrazec1</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpiši geslo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Prišlo je do problema pri ustvarjenju
 nastavitvene informacije
 za ta program.
 
 Prosim sprostite nekaj prostora in
 poizkusite ponovno.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Ne morem ustvariti zagonskih datotek
 Prosim sprostite nekaj prostora
 preden vnašate podatke</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Ne morem izvršiti alarma.
 Sprostite nekaj spomina in poizkusite ponovno.</translation>
@@ -776,138 +780,154 @@ Sprostite nekaj spomina in poizkusite ponovno.</translation>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Otroci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupine</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kartica</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kartica</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI trdi disk</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Notranja shramba</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Ne morem izvršiti alarma.
 Prosim sprostite malo prostora in poizkusite ponovno</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libqpickboard.ts b/i18n/sl/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/sl/libqpickboard.ts
+++ b/i18n/sl/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libqunikeyboard.ts b/i18n/sl/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/sl/libqunikeyboard.ts
+++ b/i18n/sl/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libtheme.ts b/i18n/sl/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/sl/libtheme.ts
+++ b/i18n/sl/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/light-and-power.ts b/i18n/sl/light-and-power.ts
index aff763f..59dadf0 100644
--- a/i18n/sl/light-and-power.ts
+++ b/i18n/sl/light-and-power.ts
@@ -1,53 +1,175 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Calibration</name>
+    <message>
+        <source>%1 Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Adjust to environment</source>
-        <translation>Prilagodi okolju</translation>
+        <translation type="obsolete">Prilagodi okolju</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>S tipanjem svetlobe kjer uporabljate napravo, lahko nastavite avtomatično nastavljanje osvetlitve. Svetlobne nastavitve vplivajo na povprečno osvetlitev.</translation>
     </message>
     <message>
         <source>Power saving</source>
-        <translation>Varčevanje energije</translation>
+        <translation type="obsolete">Varčevanje energije</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>sekundah</translation>
+        <translation type="obsolete">sekundah</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Zatemni po</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Izključi po</translation>
     </message>
     <message>
         <source>Only deactivate LCD during Suspend</source>
-        <translation>Ugasni LCS samo pri izključitvi</translation>
+        <translation type="obsolete">Ugasni LCS samo pri izključitvi</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Ugasni po</translation>
     </message>
     <message>
         <source>Bright</source>
-        <translation>Svetlo</translation>
+        <translation type="obsolete">Svetlo</translation>
     </message>
     <message>
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
-        <translation>&lt;blockquote&gt;Svetlejši je zaslon, več baterije je porabljeno.&lt;/blockquote&gt;</translation>
+        <translation type="obsolete">&lt;blockquote&gt;Svetlejši je zaslon, več baterije je porabljeno.&lt;/blockquote&gt;</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Ugasnjeno</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on AC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished">Ugasnjeno</translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/mediummount.ts b/i18n/sl/mediummount.ts
index 1c04c07..464fb98 100644
--- a/i18n/sl/mediummount.ts
+++ b/i18n/sl/mediummount.ts
@@ -1,87 +1,91 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation>Globalno</translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation>Če vstavite medij Opie poizkusi najti dokumente na tem mediju. Na velikih medijih to lahko poteka nekaj časa. Lahko nastavite, če naj Opie pregleda dokumente globalno ali na stopnji medija. Lahko pa tudi nastavite vsak medij posebej.</translation>
+        <translation type="obsolete">Če vstavite medij Opie poizkusi najti dokumente na tem mediju. Na velikih medijih to lahko poteka nekaj časa. Lahko nastavite, če naj Opie pregleda dokumente globalno ali na stopnji medija. Lahko pa tudi nastavite vsak medij posebej.</translation>
     </message>
     <message>
         <source>Enable medium checking</source>
         <translation>Vklopi preverjanje medija</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Uporabi globalne nastavitve</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Katere medijske datoteke</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Slika</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation>Katere medijske datoteke</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Slika</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Omeji iskanje na:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Vedno preveri ta medij</translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/opieplayer.ts b/i18n/sl/opieplayer.ts
index f639f41..1c4d8c6 100644
--- a/i18n/sl/opieplayer.ts
+++ b/i18n/sl/opieplayer.ts
@@ -1,272 +1,280 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation>Nekaj je narobe z
 vašo zvočno napravo.
 open(&quot;/dev/dsp&quot;)
 </translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation>
 
 Zapiram predvajalnik.</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Prekini</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation>Ni datoteke</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation>Napaka: Nobena datoteka ni izbrana</translation>
     </message>
     <message>
         <source>File not found</source>
         <translation>Ne najdem datoteke</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation>Ta datoteka ni bila najdena: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation>Ne najdem dekodirnika</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation>Oprostite, ni primernega dekodirnika za to datoteko: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation>Napak pri odpiranju datoteke</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation>Oprostite, pojavila se je napaka pri poizkusu predvajanja te datoteke: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
         <translation>Datoteka:</translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>, dolžina:</translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>Izbor predvajalnega seznama</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation>Operacije predvajanja</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation>Dodaj v seznam</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation>Odstrani iz seznama</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Predvajaj</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>Zmešaj</translation>
     </message>
     <message>
         <source>Loop</source>
         <translation>V krogu</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation>Zbriši seznam</translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation>Dodaj vse audio datoteke</translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation>Dodaj vse video datoteke</translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation>Dodaj vse datoteke</translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation>Shrani seznam</translation>
     </message>
     <message>
         <source>Export playlist to m3u</source>
-        <translation>Izvozi seznam v m3u</translation>
+        <translation type="obsolete">Izvozi seznam v m3u</translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation>Odpri datoteko ali URL</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation>Preglej za audio datoteke</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation>Preglej za video datoteke</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Celoten zaslon</translation>
     </message>
     <message>
         <source>Scale</source>
         <translation>Skala</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Premakni gor</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Premakni dol</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Naslov</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>Medij</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>Seznami</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>OpiePlayer: </translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation>Prišlo je do problema pri shranjevanju seznama.
 Vaš seznam bo mogoče drugačen
 naslednjič, ko poženete program.</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>Neveljavna datoteka</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>Prišlo je do problema pri pobiranju datoteke.</translation>
     </message>
     <message>
         <source>Save Playlist</source>
-        <translation>Shrani seznam</translation>
+        <translation type="obsolete">Shrani seznam</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation>Odstrani seznam?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>Ali res želite izbrisati
 ta seznam?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>Predvajaj izbrane</translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation>Odpri datoteko ali URL</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation>Shrani m3u seznam</translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/oxygen.ts b/i18n/sl/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/sl/oxygen.ts
+++ b/i18n/sl/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index 2ed0d6a..e100487 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sinhroniziram</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Kontakti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/sheetqt.ts b/i18n/sl/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/sl/sheetqt.ts
+++ b/i18n/sl/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/showimg.ts b/i18n/sl/showimg.ts
index 9c0afbb..d61d300 100644
--- a/i18n/sl/showimg.ts
+++ b/i18n/sl/showimg.ts
@@ -1,123 +1,158 @@
 <!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>Pregledovalnik slik</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Horizontalni obrat</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Vertikalni obrat</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Obrni za 180</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Obrni za 90</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Cel zaslon</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Pregledovalnik slik</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Resnične barve</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</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">Obrni za 270</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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/systemtime.ts b/i18n/sl/systemtime.ts
index 250ac12..79ddb90 100644
--- a/i18n/sl/systemtime.ts
+++ b/i18n/sl/systemtime.ts
@@ -1,80 +1,266 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SetDateTime</name>
     <message>
         <source>Set System Time</source>
-        <translation>Nastavi sistemski čas</translation>
+        <translation type="obsolete">Nastavi sistemski čas</translation>
     </message>
     <message>
         <source>Time Zone</source>
         <translation>Časovni pas</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time format</source>
         <translation>Oblika časa</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 ur</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 ur</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Teden se začne na</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedeljo</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Oblika datuma</translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation>Oblika programčka</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>uu:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>D/M uu:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/D hh:mm</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation>Ura</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/textedit.ts b/i18n/sl/textedit.ts
index fa7483c..8e33b02 100644
--- a/i18n/sl/textedit.ts
+++ b/i18n/sl/textedit.ts
@@ -120,189 +120,180 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
         <source>Zoom out</source>
         <translation>Pomanjšaj</translation>
     </message>
     <message>
         <source>Bold</source>
         <translation type="obsolete">Odebeljeno</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation type="obsolete">Poševno</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Objami vrstice</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Začni z novo datoteko</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Najdi naslednjega</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zapri Najdi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Urejevalnik besedila</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="obsolete">Neimenovano</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="obsolete">Pravice</translation>
     </message>
     <message>
         <source>FontDialog</source>
         <translation type="obsolete">DialogPisave</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="obsolete">Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="obsolete">Ne</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>.desktop datoteka</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Povezan dokument</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced features</source>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Opozorilo</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Napaka- ni uporabnika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Napaka- ni skupine</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Napaka pri nastavitvi lastništva ali skupine</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Napaka pri nastavitvi načina</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index 8675866..eb553de 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -1,180 +1,220 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="obsolete">Trenutno je &lt;b&gt; 1&lt;/b&gt; tekoče opravilo:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="obsolete">Trenutno je &lt;b&gt; %1&lt;/b&gt; tekočih opravil: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="obsolete">Ni tekočih opravil</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="obsolete">&lt;b&gt;%1&lt;/b&gt; novih sporočil, &lt;b&gt;%2&lt;/b&gt; izhodnih</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="obsolete">Danes ni sestankov</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Lastnik je</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
-        <source>No more appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="obsolete">OpiePošta ni nameščena</translation>
     </message>
     <message>
         <source>Today</source>
-        <translation type="obsolete">Danes</translation>
+        <translation type="unfinished">Danes</translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished">Nastavitve Danes</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Različno</translation>
     </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="obsolete">Nastavitve Danes</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="obsolete">Naj bo 
 lokacija 
 prikazana?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="obsolete">Naj bodo zapiski 
 prikazani?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="obsolete">Prikaži samo kasnejše
 zmenke</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="obsolete">Koledar</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="obsolete">Koliko opravil
 naj bo 
 prikazanih?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="obsolete">Opravila</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="obsolete">Odščipni po koliko
 znakih</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Različno</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should
 be shown?</source>
         <translation type="obsolete">Koliko
 sestankov
 naj bo
 prikazanih?</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume? (Opie only)</source>
         <translation type="obsolete">Naj se danes
 avtomatsko zažene
 ob nadaljevanju? (samo Opie)</translation>
     </message>
     <message>
         <source>Activate the  
 autostart after how
 many minutes?</source>
         <translation type="obsolete">Aktiviraj
 avtomatski zagon po
 koliko minutah?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index 3781e1a..2bf42fa 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -1,224 +1,675 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>MainWindow</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Novo opravilo</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Uredi opravilo</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation type="unfinished">Poglej opravila</translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation type="unfinished">Izbriši...</translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation type="unfinished">Izbriši vse...</translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">Podvoji</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished">Prežarči</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished">Najdi</translation>
+    </message>
+    <message>
+        <source>Completed tasks</source>
+        <translation type="unfinished">Končana opravila</translation>
+    </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished">Prikaži rok</translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished">Podatki</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorija</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Izbire</translation>
+    </message>
+    <message>
+        <source>Show only over due</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation type="unfinished">Vse kategorije</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation type="unfinished">Zmanjkalo prostora</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished">Ne uspem
+shraniti vaših sprememb.
+Sprostite nekaj prostora
+in poizkusite ponovno.
+
+Izhod?</translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished">Opravki</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Ne morem urediti podatkov, trenutno sinhroniziram</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">Neizpolnjeno</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
-        <translation>Seznam opravkov</translation>
+        <translation type="obsolete">Seznam opravkov</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
-        <translation>Novo opravilo</translation>
+        <translation type="obsolete">Novo opravilo</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Prednost:</translation>
+        <translation type="obsolete">Prednost:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
-        <translation>1 - Zelo visoka</translation>
+        <translation type="obsolete">1 - Zelo visoka</translation>
     </message>
     <message>
         <source>2 - High</source>
-        <translation>2 - Visoka</translation>
+        <translation type="obsolete">2 - Visoka</translation>
     </message>
     <message>
         <source>3 - Normal</source>
-        <translation>3 - Normalna</translation>
+        <translation type="obsolete">3 - Normalna</translation>
     </message>
     <message>
         <source>4 - Low</source>
-        <translation>4 - Nizka</translation>
+        <translation type="obsolete">4 - Nizka</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
-        <translation>5 - Zelo nizka</translation>
+        <translation type="obsolete">5 - Zelo nizka</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Kategorija:</translation>
+        <translation type="obsolete">Kategorija:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
-        <translation>&amp;Končano</translation>
+        <translation type="obsolete">&amp;Končano</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
-        <translation>Z&amp;apade</translation>
+        <translation type="obsolete">Z&amp;apade</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
-        <translation>1 Jan 2001</translation>
+        <translation type="obsolete">1 Jan 2001</translation>
     </message>
     <message>
         <source>Summary:</source>
-        <translation>Povzetek:</translation>
+        <translation type="obsolete">Povzetek:</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Napredovanje:</translation>
+        <translation type="obsolete">Napredovanje:</translation>
+    </message>
+    <message>
+        <source>0%</source>
+        <translation type="obsolete">0%</translation>
+    </message>
+    <message>
+        <source>20%</source>
+        <translation type="obsolete">20%</translation>
+    </message>
+    <message>
+        <source>40%</source>
+        <translation type="obsolete">40%</translation>
+    </message>
+    <message>
+        <source>60%</source>
+        <translation type="obsolete">60%</translation>
+    </message>
+    <message>
+        <source>80%</source>
+        <translation type="obsolete">80%</translation>
+    </message>
+    <message>
+        <source>100%</source>
+        <translation type="obsolete">100%</translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Uredi opravilo</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>C.</source>
+        <translation type="unfinished">K.</translation>
+    </message>
+    <message>
+        <source>Prior.</source>
+        <translation type="unfinished">Pred.</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished">Rok</translation>
+    </message>
+    <message>
+        <source>Table View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvanced</name>
+    <message>
+        <source>Form2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>State:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Postponed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintainer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintain Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Form3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished">1 - Zelo visoka</translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished">2 - Visoka</translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished">3 - Normalna</translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished">4 - Nizka</translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished">5 - Zelo nizka</translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0%</source>
-        <translation>0%</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20%</source>
-        <translation>20%</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40%</source>
-        <translation>40%</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60%</source>
-        <translation>60%</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80%</source>
-        <translation>80%</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
-        <translation>100%</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorija</translation>
+    </message>
+    <message>
+        <source>Enable Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished">Seznam opravkov</translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
-        <translation>K.</translation>
+        <translation type="obsolete">K.</translation>
     </message>
     <message>
         <source>Prior.</source>
-        <translation>Pred.</translation>
+        <translation type="obsolete">Pred.</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Opis</translation>
+        <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Neizpolnjeno</translation>
+        <translation type="obsolete">Neizpolnjeno</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Vse</translation>
+        <translation type="obsolete">Vse</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>Rok</translation>
+        <translation type="obsolete">Rok</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
-        <translation>Opravki</translation>
+        <translation type="obsolete">Opravki</translation>
     </message>
     <message>
         <source>Out of Space</source>
-        <translation>Zmanjkalo prostora</translation>
+        <translation type="obsolete">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
-        <translation>Ne uspem ustvariti zagonskih datotek
+        <translation type="obsolete">Ne uspem ustvariti zagonskih datotek
 Sprostite nekaj prostora
 preden vnesete podatke</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Novo opravilo</translation>
+        <translation type="obsolete">Novo opravilo</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Prežarči</translation>
+        <translation type="obsolete">Prežarči</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Najdi</translation>
+        <translation type="obsolete">Najdi</translation>
     </message>
     <message>
         <source>Completed tasks</source>
-        <translation>Končana opravila</translation>
+        <translation type="obsolete">Končana opravila</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Ne morem urediti podatkov, trenutno sinhroniziram</translation>
+        <translation type="obsolete">Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Uredi opravilo</translation>
+        <translation type="obsolete">Uredi opravilo</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Vse kategorije</translation>
+        <translation type="obsolete">Vse kategorije</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Neizpolnjeno</translation>
+        <translation type="obsolete">Neizpolnjeno</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Zmanjkalo prostora</translation>
+        <translation type="obsolete">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>Ne uspem
+        <translation type="obsolete">Ne uspem
 shraniti vaših sprememb.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Show Deadline</source>
-        <translation>Prikaži rok</translation>
+        <translation type="obsolete">Prikaži rok</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>Podatki</translation>
+        <translation type="obsolete">Podatki</translation>
     </message>
     <message>
         <source>Fonts</source>
-        <translation>Pisave</translation>
+        <translation type="obsolete">Pisave</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Poglej opravila</translation>
+        <translation type="obsolete">Poglej opravila</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Izbriši...</translation>
+        <translation type="obsolete">Izbriši...</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Izbriši vse...</translation>
+        <translation type="obsolete">Izbriši vse...</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Podvoji</translation>
+        <translation type="obsolete">Podvoji</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorija</translation>
+        <translation type="obsolete">Kategorija</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Izbire</translation>
+        <translation type="obsolete">Izbire</translation>
     </message>
     <message>
         <source>all tasks</source>
-        <translation>vsa opravila</translation>
+        <translation type="obsolete">vsa opravila</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/addressbook.ts b/i18n/zh_CN/addressbook.ts
index 591e4fe..ca8580f 100644
--- a/i18n/zh_CN/addressbook.ts
+++ b/i18n/zh_CN/addressbook.ts
@@ -14,359 +14,413 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arrange Edit Fields</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is not enough space to create
-neccessary startup files.
-
-Free up some space before
-entering data!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mb</source>
+        <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>First Name</source>
+        <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Name</source>
+        <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
+        <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Email</source>
+        <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
+        <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font</source>
+        <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
+        <source>Unable to find a contact for this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Large</source>
+        <source>search pattern !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import vCard</source>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ContactEditor</name>
+    <name>ConfigDlg_Base</name>
     <message>
-        <source>Default Email</source>
+        <source>MyDialog1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emails</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContactEditor</name>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1121,209 +1175,149 @@ Quit anyway?</source>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</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>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Spouse</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>Work Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Mobile</source>
+        <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuwait</source>
+        <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/advancedfm.ts b/i18n/zh_CN/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/zh_CN/advancedfm.ts
+++ b/i18n/zh_CN/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/checkbook.ts b/i18n/zh_CN/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/zh_CN/checkbook.ts
+++ b/i18n/zh_CN/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/citytime.ts b/i18n/zh_CN/citytime.ts
index 62e2ce2..a250baf 100644
--- a/i18n/zh_CN/citytime.ts
+++ b/i18n/zh_CN/citytime.ts
@@ -1,51 +1,67 @@
 <!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>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/embeddedkonsole.ts b/i18n/zh_CN/embeddedkonsole.ts
index 5251b68..5699a9c 100644
--- a/i18n/zh_CN/embeddedkonsole.ts
+++ b/i18n/zh_CN/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</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/keypebble.ts b/i18n/zh_CN/keypebble.ts
index 7be0f0f..d18d9f6 100644
--- a/i18n/zh_CN/keypebble.ts
+++ b/i18n/zh_CN/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </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>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/kpacman.ts b/i18n/zh_CN/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/zh_CN/kpacman.ts
+++ b/i18n/zh_CN/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/language.ts b/i18n/zh_CN/language.ts
index 6ed8dae..24fd93b 100644
--- a/i18n/zh_CN/language.ts
+++ b/i18n/zh_CN/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libliquid.ts b/i18n/zh_CN/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/zh_CN/libliquid.ts
+++ b/i18n/zh_CN/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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/libmetal.ts b/i18n/zh_CN/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/zh_CN/libmetal.ts
+++ b/i18n/zh_CN/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libopie.ts b/i18n/zh_CN/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/zh_CN/libopie.ts
+++ b/i18n/zh_CN/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libqdvorak.ts b/i18n/zh_CN/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/zh_CN/libqdvorak.ts
+++ b/i18n/zh_CN/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libqhandwriting.ts b/i18n/zh_CN/libqhandwriting.ts
index e7358b9..20ed59b 100644
--- a/i18n/zh_CN/libqhandwriting.ts
+++ b/i18n/zh_CN/libqhandwriting.ts
@@ -1,132 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libqjumpx.ts b/i18n/zh_CN/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/zh_CN/libqjumpx.ts
+++ b/i18n/zh_CN/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libqkeyboard.ts b/i18n/zh_CN/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/zh_CN/libqkeyboard.ts
+++ b/i18n/zh_CN/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libqkjumpx.ts b/i18n/zh_CN/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/zh_CN/libqkjumpx.ts
+++ b/i18n/zh_CN/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libqpe.ts b/i18n/zh_CN/libqpe.ts
index 16a917b..4421779 100644
--- a/i18n/zh_CN/libqpe.ts
+++ b/i18n/zh_CN/libqpe.ts
@@ -51,413 +51,385 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
-        <source>View</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -766,137 +738,153 @@ Free some memory and try again.</source>
     <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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</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>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libqpickboard.ts b/i18n/zh_CN/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/zh_CN/libqpickboard.ts
+++ b/i18n/zh_CN/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libqunikeyboard.ts b/i18n/zh_CN/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/zh_CN/libqunikeyboard.ts
+++ b/i18n/zh_CN/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/libtheme.ts b/i18n/zh_CN/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/zh_CN/libtheme.ts
+++ b/i18n/zh_CN/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</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 18b2baa..0deb0b7 100644
--- a/i18n/zh_CN/light-and-power.ts
+++ b/i18n/zh_CN/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <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>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>on AC</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>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/mediummount.ts b/i18n/zh_CN/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/zh_CN/mediummount.ts
+++ b/i18n/zh_CN/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/opieplayer.ts b/i18n/zh_CN/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/zh_CN/opieplayer.ts
+++ b/i18n/zh_CN/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/oxygen.ts b/i18n/zh_CN/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/zh_CN/oxygen.ts
+++ b/i18n/zh_CN/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/zh_CN/qpe.ts b/i18n/zh_CN/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/zh_CN/qpe.ts
+++ b/i18n/zh_CN/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/sheetqt.ts b/i18n/zh_CN/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/zh_CN/sheetqt.ts
+++ b/i18n/zh_CN/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/showimg.ts b/i18n/zh_CN/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/zh_CN/showimg.ts
+++ b/i18n/zh_CN/showimg.ts
@@ -1,123 +1,158 @@
 <!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> True color</source>
         <translation type="unfinished"></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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/sound.ts b/i18n/zh_CN/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/zh_CN/sound.ts
+++ b/i18n/zh_CN/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/systemtime.ts b/i18n/zh_CN/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/zh_CN/systemtime.ts
+++ b/i18n/zh_CN/systemtime.ts
@@ -1,80 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/textedit.ts b/i18n/zh_CN/textedit.ts
index 176a7ce..590359f 100644
--- a/i18n/zh_CN/textedit.ts
+++ b/i18n/zh_CN/textedit.ts
@@ -1,308 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</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>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
-    <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Style</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>About</source>
         <translation type="unfinished"></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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</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>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 3a162ff..63e671c 100644
--- a/i18n/zh_CN/today.ts
+++ b/i18n/zh_CN/today.ts
@@ -1,166 +1,120 @@
 <!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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/zh_CN/todolist.ts b/i18n/zh_CN/todolist.ts
index 79e60a4..abfe54e 100644
--- a/i18n/zh_CN/todolist.ts
+++ b/i18n/zh_CN/todolist.ts
@@ -1,217 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>NewTaskDialog</name>
+    <name>MainWindow</name>
     <message>
-        <source>Todo List</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40%</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>NewTaskDialog</name>
+</context>
+<context>
+    <name>NewTaskDialogBase</name>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>Todo</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Show Deadline</source>
+        <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Delete all...</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>all tasks</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 591e4fe..ca8580f 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -14,359 +14,413 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arrange Edit Fields</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is not enough space to create
-neccessary startup files.
-
-Free up some space before
-entering data!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mb</source>
+        <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>First Name</source>
+        <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Name</source>
+        <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File As</source>
+        <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default Email</source>
+        <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gender</source>
+        <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Font</source>
+        <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Normal</source>
+        <source>Unable to find a contact for this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Large</source>
+        <source>search pattern !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import vCard</source>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ContactEditor</name>
+    <name>ConfigDlg_Base</name>
     <message>
-        <source>Default Email</source>
+        <source>MyDialog1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emails</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name Title</source>
+        <source>Query Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Wrap Around</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ContactEditor</name>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1121,209 +1175,149 @@ Quit anyway?</source>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</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>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Spouse</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>Work Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work Mobile</source>
+        <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kuwait</source>
+        <source>Kyrgystan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Kyrgystan</source>
+        <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index ad02da8..fe68433 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -27,229 +27,233 @@
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <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="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </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>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/checkbook.ts b/i18n/zh_TW/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/zh_TW/checkbook.ts
+++ b/i18n/zh_TW/checkbook.ts
@@ -1,295 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Payment</source>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
 <context>
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Balance:</source>
+        <source>Enter description of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/citytime.ts b/i18n/zh_TW/citytime.ts
index 62e2ce2..a250baf 100644
--- a/i18n/zh_TW/citytime.ts
+++ b/i18n/zh_TW/citytime.ts
@@ -1,51 +1,67 @@
 <!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>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></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>
+    <message>
+        <source>Continent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/embeddedkonsole.ts b/i18n/zh_TW/embeddedkonsole.ts
index 5251b68..5699a9c 100644
--- a/i18n/zh_TW/embeddedkonsole.ts
+++ b/i18n/zh_TW/embeddedkonsole.ts
@@ -97,116 +97,124 @@
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</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_TW/keypebble.ts b/i18n/zh_TW/keypebble.ts
index 7be0f0f..d18d9f6 100644
--- a/i18n/zh_TW/keypebble.ts
+++ b/i18n/zh_TW/keypebble.ts
@@ -48,189 +48,233 @@ connection.</source>
     </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>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Bookmark Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/kpacman.ts b/i18n/zh_TW/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/zh_TW/kpacman.ts
+++ b/i18n/zh_TW/kpacman.ts
@@ -114,141 +114,119 @@ or is of an unknown format.</source>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/language.ts b/i18n/zh_TW/language.ts
index 6ed8dae..24fd93b 100644
--- a/i18n/zh_TW/language.ts
+++ b/i18n/zh_TW/language.ts
@@ -1,13 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select language</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libliquid.ts b/i18n/zh_TW/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/zh_TW/libliquid.ts
+++ b/i18n/zh_TW/libliquid.ts
@@ -1,85 +1,71 @@
 <!DOCTYPE TS><TS>
 <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>Draw liquid window title bars</source>
-        <translation type="obsolete"></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>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></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_TW/libmetal.ts b/i18n/zh_TW/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/zh_TW/libmetal.ts
+++ b/i18n/zh_TW/libmetal.ts
@@ -1,22 +1,12 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Metal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopie.ts b/i18n/zh_TW/libopie.ts
index 72709cf..077f3a2 100644
--- a/i18n/zh_TW/libopie.ts
+++ b/i18n/zh_TW/libopie.ts
@@ -1,207 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <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>OFileSelector</name>
+</context>
+<context>
+    <name>OFontMenu</name>
+</context>
+<context>
+    <name>OFontSelector</name>
+</context>
+<context>
+    <name>ORecurranceBase</name>
     <message>
-        <source>Documents</source>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Files</source>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Files</source>
+        <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;ancel</source>
+        <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
+        <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mime Type</source>
+        <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ser Permission</source>
+        <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontMenu</name>
     <message>
-        <source>Large</source>
+        <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium</source>
+        <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Small</source>
+        <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>OFontSelector</name>
     <message>
-        <source>Style</source>
+        <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>TimePicker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Summary:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqdvorak.ts b/i18n/zh_TW/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/zh_TW/libqdvorak.ts
+++ b/i18n/zh_TW/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libqhandwriting.ts b/i18n/zh_TW/libqhandwriting.ts
index e7358b9..20ed59b 100644
--- a/i18n/zh_TW/libqhandwriting.ts
+++ b/i18n/zh_TW/libqhandwriting.ts
@@ -1,132 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1%</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-stroke character timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Customize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqjumpx.ts b/i18n/zh_TW/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/zh_TW/libqjumpx.ts
+++ b/i18n/zh_TW/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libqkeyboard.ts b/i18n/zh_TW/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/zh_TW/libqkeyboard.ts
+++ b/i18n/zh_TW/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libqkjumpx.ts b/i18n/zh_TW/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/zh_TW/libqkjumpx.ts
+++ b/i18n/zh_TW/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index 16a917b..4421779 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -51,413 +51,385 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
-        <source>View</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Find</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>Form1</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>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
@@ -766,137 +738,153 @@ Free some memory and try again.</source>
     <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>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</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>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</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>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqpickboard.ts b/i18n/zh_TW/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/zh_TW/libqpickboard.ts
+++ b/i18n/zh_TW/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libqunikeyboard.ts b/i18n/zh_TW/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/zh_TW/libqunikeyboard.ts
+++ b/i18n/zh_TW/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libtheme.ts b/i18n/zh_TW/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/zh_TW/libtheme.ts
+++ b/i18n/zh_TW/libtheme.ts
@@ -1,49 +1,39 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the theme to be used</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>[No theme]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/light-and-power.ts b/i18n/zh_TW/light-and-power.ts
index 18b2baa..0deb0b7 100644
--- a/i18n/zh_TW/light-and-power.ts
+++ b/i18n/zh_TW/light-and-power.ts
@@ -1,53 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>LightSettingsBase</name>
+    <name>Calibration</name>
     <message>
-        <source>Adjust to environment</source>
+        <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
     <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>
+        <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dim light after</source>
+        <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Suspend after</source>
+        <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only deactivate LCD during Suspend</source>
+        <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light off after</source>
+        <source>on Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bright</source>
+        <source>on AC</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>
+        <source>Warnings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Light and Power Settings</source>
+        <source>Dark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/mediummount.ts b/i18n/zh_TW/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/zh_TW/mediummount.ts
+++ b/i18n/zh_TW/mediummount.ts
@@ -1,87 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opieplayer.ts b/i18n/zh_TW/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/zh_TW/opieplayer.ts
+++ b/i18n/zh_TW/opieplayer.ts
@@ -1,264 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</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>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -1,132 +1,108 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Density</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 nm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PSE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 357c8b8..d5f6e32 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -1,17 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shut down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/sheetqt.ts b/i18n/zh_TW/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/zh_TW/sheetqt.ts
+++ b/i18n/zh_TW/sheetqt.ts
@@ -575,241 +575,241 @@
         <source>Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help file not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/showimg.ts b/i18n/zh_TW/showimg.ts
index c42e7d7..8f08d9e 100644
--- a/i18n/zh_TW/showimg.ts
+++ b/i18n/zh_TW/showimg.ts
@@ -1,123 +1,158 @@
 <!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> True color</source>
         <translation type="unfinished"></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>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/sound.ts b/i18n/zh_TW/sound.ts
index cc385a9..559bf2b 100644
--- a/i18n/zh_TW/sound.ts
+++ b/i18n/zh_TW/sound.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <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="obsolete"></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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/systemtime.ts b/i18n/zh_TW/systemtime.ts
index b100610..ca10683 100644
--- a/i18n/zh_TW/systemtime.ts
+++ b/i18n/zh_TW/systemtime.ts
@@ -1,80 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>SetDateTime</name>
+    <name>Ntp</name>
+    <message>
+        <source>time.fu-berlin.de</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You asked for a delay of </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes, but only </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> minutes elapsed since last lookup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rerun NTP?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>last [h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>offset [s]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>shift [s/h]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NtpBase</name>
+    <message>
+        <source>Network Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get time from network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Set System Time</source>
+        <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Esimated Shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predicted Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mean shift:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>as</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server to get the time from the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wait for </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes until</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP tries to syncronises the clock with the network.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insure a delay of</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>a new NTP lookup will be used to predict the time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SetDateTime</name>
+    <message>
         <source>Time Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index 176a7ce..590359f 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -1,308 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</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>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</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>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</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>FontDialog</name>
-    <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Style</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete"></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="obsolete"></translation>
-    </message>
-    <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</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>About</source>
         <translation type="unfinished"></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>
+        <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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="obsolete"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</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>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_TW/today.ts b/i18n/zh_TW/today.ts
index 3a162ff..63e671c 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -1,166 +1,120 @@
 <!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="obsolete"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="obsolete"></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 appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
-        <source>Opiemail not installed</source>
-        <translation type="obsolete"></translation>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="obsolete"></translation>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>todayconfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Should the 
-location 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
     <message>
-        <source>Should the notes 
-be shown?</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Show only later
-appointments</source>
-        <translation type="obsolete"></translation>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Calendar</source>
-        <translation type="obsolete"></translation>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many
-tasks should 
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tasks</source>
-        <translation type="obsolete"></translation>
+        <source>Icon size</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip after how
-many letters</source>
-        <translation type="obsolete"></translation>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
-        <translation type="obsolete"></translation>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should
-be shown?</source>
-        <translation type="obsolete"></translation>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Should today be
-autostarted on
-resume? (Opie only)</source>
-        <translation type="obsolete"></translation>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate the  
-autostart after how
-many minutes?</source>
-        <translation type="obsolete"></translation>
+        <source>never</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>todayconfig</name>
+</context>
 </TS>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 79e60a4..abfe54e 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -1,217 +1,460 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>NewTaskDialog</name>
+    <name>MainWindow</name>
     <message>
-        <source>Todo List</source>
+        <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
+        <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority:</source>
+        <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
+        <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
+        <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
+        <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
+        <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
+        <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
+        <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
+        <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Summary:</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0%</source>
+        <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20%</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40%</source>
+        <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60%</source>
+        <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>80%</source>
+        <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>100%</source>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoTable</name>
+    <name>NewTaskDialog</name>
+</context>
+<context>
+    <name>NewTaskDialogBase</name>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reminders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Ref</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deadline</source>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorAdvanced</name>
     <message>
-        <source>Todo</source>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of Space</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Task</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed tasks</source>
+        <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
+        <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Task</source>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
+        <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
+        <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
+        <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
+        <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Show Deadline</source>
+        <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
+        <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fonts</source>
+        <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View Task</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete...</source>
+        <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>Delete all...</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Duplicate</source>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 - Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2002</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1 Januar 2001</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>work on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>buy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>organize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>get</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
+        <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>all tasks</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TemplateDialog</name>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateDialogImpl</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TemplateEditor</name>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>