32 files changed, 1478 insertions, 671 deletions

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
@@ -1,468 +1,522 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <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>
         <source>Contacts</source>
         <translation type="unfinished"></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>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1025,305 +1079,245 @@ Quit anyway?</source>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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
@@ -1,255 +1,259 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </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
@@ -1,212 +1,220 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</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>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -1,236 +1,280 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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
@@ -18,237 +18,215 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation type="unfinished"></translation>
     </message>
     <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
@@ -1,559 +1,531 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <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>
     </message>
     <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</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>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</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>Are you sure you want to delete
  %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
@@ -670,233 +642,249 @@ Free some memory and try again.</source>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business 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>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</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>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <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,153 +1,129 @@
 <!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>
     <message>
         <source>Periodic System</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
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
@@ -479,337 +479,337 @@
         <source>&amp;Comma</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Insert</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Function</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Summation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Absolute Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Sine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cosine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ArcCosine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>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>all tasks</source>
+        <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodoTable</name>
+</context>
+<context>
+    <name>TodoWindow</name>
+</context>
 </TS>