20 files changed, 356 insertions, 271 deletions

diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index ad6d227..c597eca 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -1,1340 +1,1306 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AddressbookWindow</name>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>AbView</name>
     <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
+        <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AddressbookWindow</name>
     <message>
-        <source>View</source>
+        <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export vCard</source>
+        <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You have to select a contact !</source>
+        <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You have to set a filename !</source>
+        <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source></source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Opie</name>
+    <message>
+        <source>Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Write Mail To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>My Personal Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show quick search bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/appearance.ts b/i18n/en/appearance.ts
index 7620e42..1c7b4ef 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -1,254 +1,220 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;new&gt;</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/backup.ts b/i18n/en/backup.ts
index 06c9bc8..11fcecf 100644
--- a/i18n/en/backup.ts
+++ b/i18n/en/backup.ts
@@ -1,148 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation type="unfinished"></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>
-</context>
-<context>
-    <name>BackupAndRestoreBase</name>
     <message>
-        <source>Backup And Restore</source>
+        <source>&lt;qt&gt;%1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Backup</source>
+        <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Applications</source>
+        <source>Would you really overwrite your local data?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Backup</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restore</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BackupAndRestoreBase</name>
     <message>
-        <source>Select Source</source>
+        <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Column 1</source>
+        <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Restore</source>
+        <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Locations</source>
+        <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
+        <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
+        <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Destination</source>
+        <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type</source>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User Data (Configuration + PIM)</source>
+        <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Full Backup (Root File System)</source>
+        <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/calculator.ts b/i18n/en/calculator.ts
index 2b4a1cc..d142fcc 100644
--- a/i18n/en/calculator.ts
+++ b/i18n/en/calculator.ts
@@ -1,331 +1,331 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ln</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>sin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+/-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>=</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calculator</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></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/en/datebook.ts b/i18n/en/datebook.ts
index 7432411..afc82e5 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -1,796 +1,815 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstEvent</name>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/gutenbrowser.ts b/i18n/en/gutenbrowser.ts
index 1bfae93..70a3769 100644
--- a/i18n/en/gutenbrowser.ts
+++ b/i18n/en/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/en/launchersettings.ts b/i18n/en/launchersettings.ts
index 679868d..c75d513 100644
--- a/i18n/en/launchersettings.ts
+++ b/i18n/en/launchersettings.ts
@@ -1,270 +1,278 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettings</name>
     <message>
         <source>Enable the Documents Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the Documents Tab to be visible.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethodSettings</name>
     <message>
         <source>Resize application on Popup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable floating and resizing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check, if you want to move and/or resize input methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Specify the percentage of the screen width for the input method</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>InputMethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
     <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 type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libaboutapplet.ts b/i18n/en/libaboutapplet.ts
index f6e6187..77c88cd 100644
--- a/i18n/en/libaboutapplet.ts
+++ b/i18n/en/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/en/libopiecore2.ts b/i18n/en/libopiecore2.ts
index 4a4f2b2..427ef9e 100644
--- a/i18n/en/libopiecore2.ts
+++ b/i18n/en/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/en/libopiepim2.ts b/i18n/en/libopiepim2.ts
index 98ceba6..fc181a1 100644
--- a/i18n/en/libopiepim2.ts
+++ b/i18n/en/libopiepim2.ts
@@ -1,758 +1,726 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OPimRecurrenceWidget</name>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></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>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </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>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </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>All Emails: </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>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libvmemoapplet.ts b/i18n/en/libvmemoapplet.ts
index 8371675..62ffe69 100644
--- a/i18n/en/libvmemoapplet.ts
+++ b/i18n/en/libvmemoapplet.ts
@@ -1,13 +1,17 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VMemo</name>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>error recording</source>
         <translation type="unfinished"></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/en/libwlan.ts b/i18n/en/libwlan.ts
index d7985ab..da97782 100644
--- a/i18n/en/libwlan.ts
+++ b/i18n/en/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/en/opie-eye.ts b/i18n/en/opie-eye.ts
index 1fb34c5..02da4de 100644
--- a/i18n/en/opie-eye.ts
+++ b/i18n/en/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/en/opieirc.ts b/i18n/en/opieirc.ts
index ad2176c..b23aa7d 100644
--- a/i18n/en/opieirc.ts
+++ b/i18n/en/opieirc.ts
@@ -1,648 +1,719 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></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>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You left channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></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/en/opierec.ts b/i18n/en/opierec.ts
index b7d47ec..6092bd6 100644
--- a/i18n/en/opierec.ts
+++ b/i18n/en/opierec.ts
@@ -1,164 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low Disk Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mute</source>
         <translation type="unfinished"></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/en/ordesktop.ts b/i18n/en/ordesktop.ts
index 4eb9e18..abaf308 100644
--- a/i18n/en/ordesktop.ts
+++ b/i18n/en/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/en/packagemanager.ts b/i18n/en/packagemanager.ts
index d86ecec..cf7d076 100644
--- a/i18n/en/packagemanager.ts
+++ b/i18n/en/packagemanager.ts
@@ -1,654 +1,666 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FilterDlg</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></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>InstallDlg</name>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</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>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Enter the name of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Enter the name of this entry here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></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>
 </TS>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index ed41643..3ae362a 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -1,418 +1,413 @@
 <!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"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished"></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"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <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>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
     <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>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</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>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"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>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"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></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>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
     <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>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/security.ts b/i18n/en/security.ts
index ca86afe..770af2b 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -1,244 +1,244 @@
 <!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"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></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>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></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/en/systemtime.ts b/i18n/en/systemtime.ts
index aa9898a..6b8b1bd 100644
--- a/i18n/en/systemtime.ts
+++ b/i18n/en/systemtime.ts
@@ -1,242 +1,246 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>%1 seconds</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>