20 files changed, 395 insertions, 158 deletions

diff --git a/i18n/xx/addressbook.ts b/i18n/xx/addressbook.ts
index d274dfe..6136089 100644
--- a/i18n/xx/addressbook.ts
+++ b/i18n/xx/addressbook.ts
@@ -1,1507 +1,1553 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>AbView</name>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+</context>
+<context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contact</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>List</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Card</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Start Search</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Write Mail To</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Beam Entry</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Import vCard</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>My Personal Details</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Save all Data</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Address</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cards</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Export vCard</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Edit Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>China</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>France</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>India</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Opie</name>
+    <message>
+        <source>Contact</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Start Search</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Write Mail To</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Import vCard</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>My Personal Details</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Show quick search bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/appearance.ts b/i18n/xx/appearance.ts
index f882a22..50fb682 100644
--- a/i18n/xx/appearance.ts
+++ b/i18n/xx/appearance.ts
@@ -1,270 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Show Scrollbars on the left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to display scrollbars on the left side instead of the right.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/backup.ts b/i18n/xx/backup.ts
index b30575b..4704287 100644
--- a/i18n/xx/backup.ts
+++ b/i18n/xx/backup.ts
@@ -1,168 +1,168 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Would you really overwrite your local data?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update Filelist</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Locations</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>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Data (Configuration + PIM)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Backup (Root File System)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/calculator.ts b/i18n/xx/calculator.ts
index a0fd242..ca8c6a9 100644
--- a/i18n/xx/calculator.ts
+++ b/i18n/xx/calculator.ts
@@ -1,335 +1,339 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>Experimental Calculator</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>log</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>3</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>6</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>=</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>x</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Calculator</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>fl oz (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>g</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>gal (US)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hectares</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>l</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lg tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ml</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>naut. mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>oz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>pt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sq yd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St tons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tblspoon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>teaspoons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tonnes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index 87d4923..bd12869 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -1,835 +1,854 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>error box</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>T</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>W</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>F</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>S</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstEvent</name>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fr</source>
         <comment>Friday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sa</source>
         <comment>Saturday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Su</source>
         <comment>Sunday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/gutenbrowser.ts b/i18n/xx/gutenbrowser.ts
index 1bfae93..70a3769 100644
--- a/i18n/xx/gutenbrowser.ts
+++ b/i18n/xx/gutenbrowser.ts
@@ -1,448 +1,448 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Edit_Title</name>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontDialog</name>
     <message>
         <source>Font Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
-        <source>Gutenbrowser Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Library Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ftp Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Etext Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenberg Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search google.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please install unzip in your PATH</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Downloading Gutenberg Index....</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HelpMe</name>
     <message>
         <source>Based on gutenbook.pl, available from http://www.gutenbook.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Much appreciation to Lee Burgess,</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>for the original idea and concept of gutenbook.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>For bug reports, comments or questions about Gutenbrowser, email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ljp@llornkcor.com
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Made using Qt, Qt Embedded, and Qtopia, a cross platform development API
 http://www.trolltech.com
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arnold&apos;s Laws of Documentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(1) If it should exist, it doesn&apos;t.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(2) If it does exist, it&apos;s out of date.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(3) Only documentation for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>useless programs transcends the</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>first two laws.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Everything is temporary, anyway....
  :o)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Go</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Error opening local library index:&lt;/P&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Library Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A-F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>G-M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>N-R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>   </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenEtext</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Etext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Sea&amp;rch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchResultsDlg</name>
     <message>
         <source>Search Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>optionsDialog</name>
     <message>
         <source>Opera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Konqueror</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>wget</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>Downloading ftp sites....</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ftpSiteDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not opened sucessfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://sailor.gutenberg.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>http://www.prairienet.org/pg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gutenbrowser Options</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/launchersettings.ts b/i18n/xx/launchersettings.ts
index a17de22..f027dd7 100644
--- a/i18n/xx/launchersettings.ts
+++ b/i18n/xx/launchersettings.ts
@@ -1,278 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Applications in Subpopups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Columns:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable animated busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable static background pixmap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want the background pixmap not to scroll with the icons.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libaboutapplet.ts b/i18n/xx/libaboutapplet.ts
index f6e6187..77c88cd 100644
--- a/i18n/xx/libaboutapplet.ts
+++ b/i18n/xx/libaboutapplet.ts
@@ -1,74 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Report</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
 &lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
 &lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Alberto &apos;Skyhusker&apos; Garcia Hierro&lt;/b&gt; (skyhusker@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
+&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
+&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopiecore2.ts b/i18n/xx/libopiecore2.ts
index 4a4f2b2..427ef9e 100644
--- a/i18n/xx/libopiecore2.ts
+++ b/i18n/xx/libopiecore2.ts
@@ -1,88 +1,96 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display Rotate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo Button</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Hinge1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hinge2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hinge3</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Trash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopiepim2.ts b/i18n/xx/libopiepim2.ts
index e066a6c..61c5add 100644
--- a/i18n/xx/libopiepim2.ts
+++ b/i18n/xx/libopiepim2.ts
@@ -1,1200 +1,1168 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>More...</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to view all items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view items belonging to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to view all unfiled items.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to edit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to duplicate the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to search for an item.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to filter the items displayed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to modify the current filter settings.</source>
+        <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>Opie::Ui::OFontSelector</name>
     <message>
         <source>Style</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>High</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</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>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Has a due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No due-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No reccurrence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No start-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No completed-date</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libvmemoapplet.ts b/i18n/xx/libvmemoapplet.ts
index 9860220..bca70e2 100644
--- a/i18n/xx/libvmemoapplet.ts
+++ b/i18n/xx/libvmemoapplet.ts
@@ -1,13 +1,17 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VMemo</name>
     <message>
         <source>Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>error recording</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>&lt;B&gt;&lt;P&gt;&lt;font size=+2&gt;VMemo-Recording&lt;/font&gt;&lt;/B&gt;&lt;p&gt;%1&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libwlan.ts b/i18n/xx/libwlan.ts
index d7985ab..da97782 100644
--- a/i18n/xx/libwlan.ts
+++ b/i18n/xx/libwlan.ts
@@ -1,148 +1,165 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>AWLan</name>
+    <message>
+        <source>&lt;UseHostName&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>WLAN</name>
+</context>
+<context>
+    <name>WLanGUI</name>
     <message>
-        <source>Wireless Configuration</source>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>any</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Infrastructure</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>ESS-ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>&lt;UseHostName&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
+        <source>Specify Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rescan Neighbourhood</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Scan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
+        <source>Accept Non-Encrypted packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Non-encrypted Packets</source>
+        <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WlanInfo</name>
     <message>
-        <source>Interface Information</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>802.11b</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Freq</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>Link Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AP</source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>Live feed </source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WLanNetNode</name>
     <message>
-        <source>Noise</source>
+        <source>WLan Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WlanInfo</name>
+</context>
 </TS>
diff --git a/i18n/xx/opie-eye.ts b/i18n/xx/opie-eye.ts
index 1fb34c5..02da4de 100644
--- a/i18n/xx/opie-eye.ts
+++ b/i18n/xx/opie-eye.ts
@@ -1,288 +1,300 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BaseSetup</name>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slideshow timeout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autoscale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>the Image %1</source>
+        <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
+        <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start slideshow</source>
+        <source>the Image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
         <source>Browser Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageinfo Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Imageview Keyboard Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go dir up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto rotate images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show images unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show zoomer window when unscaled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Dont show seperate windows</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Eye</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocView</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;&lt;b&gt;Be carefull with the following options!&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show files recursive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recursion depth:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Digital Camera View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm Deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Only</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>imageinfo</name>
     <message>
         <source>View Full Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays an thumbnail of the image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays info of selected image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/opieirc.ts b/i18n/xx/opieirc.ts
index c76f237..095737b 100644
--- a/i18n/xx/opieirc.ts
+++ b/i18n/xx/opieirc.ts
@@ -1,720 +1,791 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DCCProgress</name>
+    <message>
+        <source>Receiving file %1 from %2...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Successfully received %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aborted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Peer Aborted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DCCTransferTab</name>
+    <message>
+        <source>DCC Transfers in Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are transfers in progress. &lt;br&gt;If you close this tab, they will be canceled.&lt;br&gt;Do you want to close it anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DCC Transfer from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is trying to send you the file %2
+(%3 bytes)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCHistoryLineEdit</name>
     <message>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command : </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command : </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Received unhandled literal command : </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> joined channel </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You left channel </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> left channel </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown channel </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You are now known as </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> is now known as </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> has quit </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> by </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You are now known as %1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 unknown connection(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 channels formed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait a while and try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois %1 (%2@%3)
 Real name: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is using server %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names for %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time on server %1 is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel or nick %1 doesn&apos;t exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no history information for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t change nick to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not on channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>[%1] Operation not permitted, you don&apos;t have enough channel privileges</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connected to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has been idle for %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 signed on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Malformed DCC request from </source>
+        <source>Received a CTCP PING reply from %1: %2 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received a CTCP PING request from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Malformed DCC request from %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSession</name>
     <message>
         <source>You are now known as %1</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time in chat log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source> User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives channel operator status to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes channel operator status from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> gives voice to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> removes voice from </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/opierec.ts b/i18n/xx/opierec.ts
index befd26e..6f26ffe 100644
--- a/i18n/xx/opierec.ts
+++ b/i18n/xx/opierec.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>44100</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>32000</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>22050</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>16000</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>11025</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>8000</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>16</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>In</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low Disk Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
 the selected file?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please select file to  play</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>auto Mute</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Please select file to play</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/ordesktop.ts b/i18n/xx/ordesktop.ts
index 4eb9e18..abaf308 100644
--- a/i18n/xx/ordesktop.ts
+++ b/i18n/xx/ordesktop.ts
@@ -1,2 +1,49 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QMyDialog</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server Desc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <comment>Add Connection</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QMyScrollView</name>
+    <message>
+        <source>Remote Desktop Client (RDP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/packagemanager.ts b/i18n/xx/packagemanager.ts
index 1c4a9b0..75494f9 100644
--- a/i18n/xx/packagemanager.ts
+++ b/i18n/xx/packagemanager.ts
@@ -1,1263 +1,1279 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Names containing:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>With the status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available from the following server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installed on device at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to filter package list by application category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the application category to filter by here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to filter package list by package name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the package name to filter by here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to filter package list by the package status.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the package status to filter by here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to filter package list by source server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the source server to filter by here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to filter package list by destination where the package is installed to on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the destination location to filter by here.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Packages to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press the start button to begin.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>status file - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>package - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Could not open :</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Creating directory </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Removed %1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Removed </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failed to remove </source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>R</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>U</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update package information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download package to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The configuration has been updated.  Do you want to update server and package information now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Tap inside the box at the left to select a package.  Tap and hold to view package details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install local package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to install a package file located on device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to apply current filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to change the package filter criteria.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application Packages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkg</name>
     <message>
         <source>Linking packages installed in: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error linkling &apos;%1&apos; to &apos;%2&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Links removed for: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgConfigDlg</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>This is a list of all servers configured.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to create a new entry.  Fill in the fields below and then tap on Update.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to edit the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to delete the entry selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all destinations configured for this device.  Select one here to edit or delete, or add a new one below.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the URL address of the HTTP proxy server here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the HTTP proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the URL address of the FTP proxy server here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the FTP proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the username for the proxy servers here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the password for the proxy servers here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the &apos;-force-depends&apos; option for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the &apos;-force-reinstall&apos; option for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the &apos;-force-removal-of-dependent-packages&apos; option for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to enable or disable the &apos;-force-overwrite&apos; option for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select information level for Ipkg.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Information level:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package source lists directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the directory where package source feed information is stored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap here to select the directory where package source feed information is stored.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OIpkgDestDlg</name>
     <message>
         <source>Edit Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to indicate whether this entry is active or not.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Enter the name of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Enter the absolute directory path of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to select the desired location.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OIpkgServerDlg</name>
     <message>
         <source>Edit Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to indicate whether this entry is active or not.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Enter the name of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Enter the URL address of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compressed server feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to indicate whether the server support compressed archives or not.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPackageManager</name>
     <message>
         <source>Reading available packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reading installed packages:
 <byte value="x9"/></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageInfoDlg</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to retrieve package information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieve file list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area contains information about the package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area contains a list of files contained in this package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap here to retrieve list of files contained in this package.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Local packages</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>N/A</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index 6e36e11..179b398 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -1,586 +1,586 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">FOO</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="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">FOO</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="obsolete">FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Server</name>
     <message>
         <source>USB Lock</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">FOO</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">FOO</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">FOO</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">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">FOO</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="obsolete">FOO</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">FOO</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">FOO</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">FOO</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 or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/security.ts b/i18n/xx/security.ts
index 9249cbe..616f2c6 100644
--- a/i18n/xx/security.ts
+++ b/i18n/xx/security.ts
@@ -1,395 +1,395 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LoginBase</name>
     <message>
         <source>LoginBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
 
 For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This drop-down list allows you to select the user for auto-login
 (if enabled above).  
 
 You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MultiauthConfig</name>
     <message>
         <source>Security configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in</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>plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="obsolete">FOO {192.168.129.0/24?}</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-multiauth-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Locking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-securityplugin-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MultiauthGeneralConfig</name>
     <message>
         <source>When to lock Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Opie resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t protect this config screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Testing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test the authentication now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you don&apos;t like the result of this test, don&apos;t forget to change your settings before you exit the configuration application!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="obsolete">FOO {192.168.129.0/24?}</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Select a net-range or enter a new one.  
 
 This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
 
 For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
 
 The entry &quot;All&quot; will allow *any* IP to connect. 
 The entry &quot;None&quot; will *deny* any connection.  
 
 If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the selected net range from the list
 
 If you press this button, the currently selected net range will be deleted from the list of net ranges.
 
 If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
 the list to the state it has been when you initially booted your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will restore the list of net ranges
 to the defaults.
 
 Beware that all manually entered net ranges will be lost!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/systemtime.ts b/i18n/xx/systemtime.ts
index 1ea0ae4..31c0ace 100644
--- a/i18n/xx/systemtime.ts
+++ b/i18n/xx/systemtime.ts
@@ -1,242 +1,246 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Continue?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 seconds</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Retrieving time from network...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>