opie-lupdate

110 files changed, 5930 insertions, 3691 deletions

diff --git a/i18n/cz/addressbook.ts b/i18n/cz/addressbook.ts
index 13a7cdc..ac13c74 100644
--- a/i18n/cz/addressbook.ts
+++ b/i18n/cz/addressbook.ts
@@ -1,1336 +1,1340 @@
 <!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>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close 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>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>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</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>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</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>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</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>Not Found</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>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <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>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</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>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>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</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>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>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</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</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</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</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>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</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>File As</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>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>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</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>Afghanistan</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>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</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>Bolivia</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>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</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>France</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>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</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>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</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>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</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>Norway</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>Palestinian Sovereign Areas</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>Pitcairn Islands</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>Vietnam</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>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</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>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>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/cz/libqpe.ts b/i18n/cz/libqpe.ts
index 528a2b7..fd0bf5f 100644
--- a/i18n/cz/libqpe.ts
+++ b/i18n/cz/libqpe.ts
@@ -1,951 +1,1021 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Všechno</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nezařazeno</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(více.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Pracovní</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Osobní</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Více.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Všechno</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nová kategorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nová kategorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Úprava kategorie</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplikace</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorie jdou sem</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Zaškrtněte kategorie, do kterých tento dokument patří.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Sem zadejte novou kategorii. Pro přidání do seznamu stiskněte &lt;b&gt;Přidat&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Doleva zadejte novou kategorii a stiskněte pro její přidání.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Stiskněte pro smazání označené kategorie.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globální</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Zaškrtněte pro poskytnutí této vlastnosti všem aplikacím.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Všechny</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nezařazené</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Omlouváme se, ale jiná aplikace
 právě upravuje kategorie.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Upravit kategorie</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Všechny</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Zobrazit Leden v označeném roce</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Zobrazit předchozí měsíc</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Zobrazit následující měsíc</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Zobrazit Prosinec v označeném roce</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Zavřít dialog pro vybrání souboru</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Zobrazit dokumenty tohoto typu</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Zobrazit dokumenty v této kategorii</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klikněte pro výběr dokumentu ze seznamu</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, nebo vyberte &lt;b&gt;Nový Dokument&lt;/b&gt; pro vytvoření nového.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Pro vlastnosti dokumentu stiskněte a podržte.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Hledat</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Řetězec nenalezen.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Bylo dosaženo konce, hledám od začátku</translation>
+        <translation type="obsolete">Bylo dosaženo konce, hledám od začátku</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Co hledat:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Kde spustit hledání:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Pros 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Rozlišovat velikost</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Hledat odzadu</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Vlastnosti</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Smazání souboru selhalo.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopie</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikát</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Kopírování selhalo.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaily</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Přesunutí dokumentu selhalo.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detaily</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Použít vlastní rotaci</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Přednahrát aplikaci, aby byla okamžitě k dispozici.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Název tohoto dokumentu.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Médium, na kterém bude dokument umístěn.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Název:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Přednahrání (spotřebovává paměť)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentář:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Smazat tento dokument.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Vytvořit kopii tohoto dokumentu.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Poslat infra</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Pošle tento dokument do jiného zařízení.</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informace o majiteli</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Zadejte heslo</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Jan</source>
         <translation>Led</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Úno</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Bře</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Dub</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Kvě</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Čen</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Čec</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Srp</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Zář</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Říj</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Pro</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Úte</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Stř</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čtv</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pát</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Neď</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nový dokument</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Klikněte pro zavření okna, změny budou ztraceny.</translation>
+        <translation type="obsolete">Klikněte pro zavření okna, změny budou ztraceny.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Klikněte pro zavření okna.</translation>
+        <translation type="obsolete">Klikněte pro zavření okna.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Klikněte pro zavření okna s aplikováním změn.</translation>
+        <translation type="obsolete">Klikněte pro zavření okna s aplikováním změn.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Klikněte sem pro možnost posunování okna.</translation>
+        <translation type="obsolete">Klikněte sem pro možnost posunování okna.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Klikněte sem pro použití celé obrazovky pro okno.</translation>
+        <translation type="obsolete">Klikněte sem pro použití celé obrazovky pro okno.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Pro tuto aplikaci není k dispozici celková nápověda, ale jen kontextová.&lt;p&gt;Pro použití kontextové nápovědy:&lt;p&gt;&lt;ol&gt;&lt;li&gt;stiskněte a podržte tlačítko nápověda.&lt;li&gt;Až se ukáže lišta &lt;b&gt;Co je to...&lt;/b&gt;, klikněte na jakékoliv ovládání.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Co je to...</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Došlo místo</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Nastal problém s vytvořením
 konfigurace pro tento
 program.
 
 Prosím uvolněte nějaké místo
 a zkuste to znovu.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Nelze vytvořit startovací soubory
 Prosím uvolněte nějaké místo
 před zadáním dat</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Nelze naplánovat alarm.
 Uvolněte nějakou paměť a zkuste to znovu.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>R</translation>
     </message>
     <message>
         <source>day</source>
         <translation>den</translation>
     </message>
     <message>
         <source>month</source>
         <translation>měsíc</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Opravdu chcete smazat
 %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Všechny</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nezařazené</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresa zaměstnání:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresa domů:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Adresa emailu:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefon domů:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax domů:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobil domů:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Domácí web stránka:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pracovní web stránka:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kancelář:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefon do práce:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax do práce:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Pracovní mobil:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pracovní pager:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profese:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Vedoucí:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Muž</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Žena</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Pohlaví:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Manžel(ka):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Narozeniny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Výročí:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Přezdívka:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Druhé jméno</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Příjmení</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Přípona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Soubor jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Název práce</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Oddělení</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefon do práce</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax do práce</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobil do práce</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Výchozí email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emaily</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefon domů</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax domů</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobil domů</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulice do práce</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Město do práce</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Stát do práce</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>PSČ do práce</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Země do práce</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager do práce</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pracovní web stránka</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kancelář</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profese</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Vedoucí</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Ulice domů</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Město domů</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Stát domů</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>PSČ domů</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Země domů</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domácí web stránka</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Manžel(ka)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Pohlaví</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Narozeniny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Výročí</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Přezdívka</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Děti</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupiny</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>Dokument %1</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Klikněte pro zavření okna, změny budou ztraceny.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Klikněte pro zavření okna.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Klikněte pro zavření okna s aplikováním změn.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Klikněte sem pro použití celé obrazovky pro okno.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Karta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Karta SD</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Karta MMC</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Hard Disk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Interní paměť</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Interní disk</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Žádný</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Program citytime nebyl nalezen</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Pro výběr časového pásma nainstalujte
 prosím citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Došlo místo</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nelze naplánovat alarm.
 Uvolněte nějakou paměť a zkuste to znovu</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 souborů</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Všech %1 souborů</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Všechny soubory</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/cz/security.ts b/i18n/cz/security.ts
index 3878de9..039004f 100644
--- a/i18n/cz/security.ts
+++ b/i18n/cz/security.ts
@@ -1,260 +1,268 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Attention</source>
         <translation>Upozornění</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation>&lt;p&gt;Všechny uživatelovy síťové rozsahy budou ztraceny.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation>192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation>1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Jakákoliv</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádná</translation>
     </message>
     <message>
         <source>Set passcode</source>
         <translation>Nastavit heslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Změnit heslo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vložit heslo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Neplatné heslo</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Vložené heslo je chybné.
 Přístup odmítnut</translation>
     </message>
     <message>
         <source>WARNING</source>
-        <translation>VAROVÁNÍ</translation>
+        <translation type="obsolete">VAROVÁNÍ</translation>
     </message>
     <message>
         <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation>&lt;p&gt;Výběrem IntelliSync vypnete FTP heslo.&lt;p&gt;Každý počítač ve vaší síti bude moci provést synchronizaci s vaším zařízením!</translation>
+        <translation type="obsolete">&lt;p&gt;Výběrem IntelliSync vypnete FTP heslo.&lt;p&gt;Každý počítač ve vaší síti bude moci provést synchronizaci s vaším zařízením!</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Zadejte nové heslo</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Znovu zadejte nové heslo</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Bezpečnostní nastavení</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Změnit heslo</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation>Toto tlačítko umožní změnit bezpečnostní heslo.
 
 Poznámka: Toto *není* synchronizační heslo.</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Vyčistit heslo</translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation>Smaže aktuální heslo.
 Můžete kdykoliv zadat heslo nové.</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Při zapnutí vyžadovat heslo</translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation>Při aktivaci této volby budete muset zadat heslo při každém zapnutí Zauruse.</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Ochrana heslem poskytuje minimální ochranu před náhodným přístupem k zařízení.</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Přihlášení</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Automaticky přihlásit</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>Při aktivaci této volby vás opie-login automaticky přihlásí jako uživatele, kterého jste si vybrali v seznamu.
 
 Pro Zauruse 5x00 je to vždy uživatel &quot;root&quot;.</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>Tento seznam vám umožní vybrat uživatele pro automatické přihlášení.
 (Pokud je volba zapnutá).
 
 Můžete vybrat pouze nakonfigurované uživatele.</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronizace</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Akceptovat synchronizaci ze sítě:</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>Vyberte rozsah sítě, nebo zadejte nový.
 
 Tento seznam vám umožní vybrat rozsah sítě, která je oprávněná připojovat se do Zauruse.
 
 Například síťový rozsah 192.168.1.0/24 povolí připojení a synchronizaci jakéhokoliv počítače mezi IP adresami 192.168.1.1 a 192.168.1.254.
 
 Položka &quot;Jakákoliv&quot; umožní připojení *jakékoliv* IP adrese.
 Položka &quot;Žádná&quot; zakáže *všechna* připojení.
 
 Pokud nevíte, vyberte &quot;Jakákoliv&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Smazat položku</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>Vymaže vybraný síťový rozsah ze seznamu
 
 Po stisknutí tohoto tlačítka bude vybraný síťový rozsah vymazán ze seznamu.
 
 Jestliže stisknete tlačítko omylem, požitím tlačítka &quot;Obnovit výchozí&quot; dostanete
 seznam sítí do stavu jako po prvním nastartování Zauruse.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>Obnovit výchozí</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>Toto tlačítko vrátí seznam sítí do původního
 stavu.
 
 Uvědomte si ale, že všechny zadané rozsahy budou ztraceny!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Vyberte váš synchronizační program</translation>
     </message>
     <message>
         <source>QTopia</source>
-        <translation>QTopia</translation>
+        <translation type="obsolete">QTopia</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation>IntelliSync</translation>
     </message>
     <message>
         <source>This option changes the login behaviour of the internal FTP server.  
 
 If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
 
 The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
-        <translation>Tato volba změní chování přihlašování k vnitřnímu FTP serveru.
+        <translation type="obsolete">Tato volba změní chování přihlašování k vnitřnímu FTP serveru.
 
 Jestliže máte problém se synchronizací, zkuste &quot;IntelliSync&quot;, což nastaví akceptování libovolného hesla na sync (FTP) portu.
 
 Výchozí je Qtopia. To vám umožní přihlášení se jménem &quot;root&quot; a heslem &quot;Qtopia&quot;. Heslo rozlišuje VeLkÁ a mAlÁ písmena.</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation>Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation>Opie 1.0</translation>
     </message>
     <message>
         <source>Both</source>
-        <translation>Obojí</translation>
+        <translation type="obsolete">Obojí</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/cz/zsafe.ts b/i18n/cz/zsafe.ts
index 2fb3702..d506718 100644
--- a/i18n/cz/zsafe.ts
+++ b/i18n/cz/zsafe.ts
@@ -1,634 +1,868 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation>ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Opravdu chcete smazat?</translation>
+        <translation type="obsolete">Opravdu chcete smazat?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Smazat</translation>
+        <translation type="obsolete">&amp;Smazat</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>N&amp;emazat</translation>
+        <translation type="obsolete">N&amp;emazat</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Upravit položku</translation>
+        <translation type="obsolete">Upravit položku</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Název</translation>
+        <translation type="obsolete">Název</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Uživatelské jméno</translation>
+        <translation type="obsolete">Uživatelské jméno</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Heslo</translation>
+        <translation type="obsolete">Heslo</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation>Komentář</translation>
+        <translation type="obsolete">Komentář</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation>Pole 4</translation>
+        <translation type="obsolete">Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation>Pole 5</translation>
+        <translation type="obsolete">Pole 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Nová položka</translation>
+        <translation type="obsolete">Nová položka</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Název položky musí být jiný
+        <translation type="obsolete">Název položky musí být jiný
 než název kategorie.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Hledat</translation>
+        <translation type="obsolete">Hledat</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Položka nenalezena</translation>
+        <translation type="obsolete">Položka nenalezena</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <translation type="obsolete">&amp;OK</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation>Pole 2</translation>
+        <translation type="obsolete">Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation>Pole 3</translation>
+        <translation type="obsolete">Pole 3</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Všechno</translation>
+        <translation type="obsolete">Všechno</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Text</translation>
+        <translation type="obsolete">Text</translation>
     </message>
     <message>
         <source>Remove text file</source>
-        <translation>Odstranit textový soubor</translation>
+        <translation type="obsolete">Odstranit textový soubor</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Nelze odstranit textový soubor.</translation>
+        <translation type="obsolete">Nelze odstranit textový soubor.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
-        <translation>Dokument nebyl definován.
+        <translation type="obsolete">Dokument nebyl definován.
 Vytvořte nový dokument</translation>
     </message>
     <message>
         <source>Export text file</source>
-        <translation>Export do textového souboru</translation>
+        <translation type="obsolete">Export do textového souboru</translation>
     </message>
     <message>
         <source>Import text file</source>
-        <translation>Import z textového souboru</translation>
+        <translation type="obsolete">Import z textového souboru</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Nelze exportovat do textového souboru.</translation>
+        <translation type="obsolete">Nelze exportovat do textového souboru.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Nelze importovat textový soubor.</translation>
+        <translation type="obsolete">Nelze importovat textový soubor.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Zadejte heslo</translation>
+        <translation type="obsolete">Zadejte heslo</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Špatné heslo.
+        <translation type="obsolete">Špatné heslo.
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Špatné heslo.
+        <translation type="obsolete">Špatné heslo.
 Zkusit znovu?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ano</translation>
+        <translation type="obsolete">&amp;Ano</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Ne.</translation>
+        <translation type="obsolete">&amp;Ne.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Prázdný dokument,
+        <translation type="obsolete">Prázdný dokument,
 nebo špatné heslo.
 Pokračovat?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Ne</translation>
+        <translation type="obsolete">&amp;Ne</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ano.</translation>
+        <translation type="obsolete">&amp;Ano.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Heslo je prázdné.
+        <translation type="obsolete">Heslo je prázdné.
 Zadejte ho znovu.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Opakujte heslo</translation>
+        <translation type="obsolete">Opakujte heslo</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Hesla musí být identická.
+        <translation type="obsolete">Hesla musí být identická.
 Zadejte ho znovu.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
-        <translation>Chcete uložit změny</translation>
+        <translation type="obsolete">Chcete uložit změny</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
-        <translation>
+        <translation type="obsolete">
 před pokračováním?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Uložit</translation>
+        <translation type="obsolete">&amp;Uložit</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Neukládat</translation>
+        <translation type="obsolete">&amp;Neukládat</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Soubor s hesly uložen.</translation>
+        <translation type="obsolete">Soubor s hesly uložen.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Chcete uložit změny
+        <translation type="obsolete">Chcete uložit změny
 před ukončením?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>U&amp;ložit s
+        <translation type="obsolete">U&amp;ložit s
 novým
 heslem</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Čekejte</translation>
+        <translation type="obsolete">Čekejte</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Shromažďování ikon...</translation>
+        <translation type="obsolete">Shromažďování ikon...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Vytvořit nový ZSafe dokument</translation>
+        <translation type="obsolete">Vytvořit nový ZSafe dokument</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
-        <translation>Nyní prosím zadejte
+        <translation type="obsolete">Nyní prosím zadejte
 dvakrát heslo k vašemu
 nově vytvořenému dokumentu.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Otevřít ZSafe dokument</translation>
+        <translation type="obsolete">Otevřít ZSafe dokument</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Uložit ZSafe dokument jako..</translation>
+        <translation type="obsolete">Uložit ZSafe dokument jako..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Správce hesel&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Správce hesel&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation>ZSafe verze 2.1.2-jv01b&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe verze 2.1.2-jv01b&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>napsal Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">napsal Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Přeložil Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Přeložil Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation>ZSafe verze 2.1.2&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe verze 2.1.2&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Pole 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informace:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nová položka</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Filtr typu souborů</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Rámeček filtru typu souborů
 
 upravit nebo vybrat filtr</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>Potvrdní výběr a zavře formulář</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>Tlačítko OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>stornuje výběr a zavře formulář</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Tlačítko Storno</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>Zobrazí vybraný název souboru</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Řádka s názvem souboru
 
 zobrazí vybraný soubor
 a umožní přímou úpravu názvu
 souboru</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Rámeček adresář
 úprava, nebo výběr názvu adresáře</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
         <source>size</source>
         <translation>velikost</translation>
     </message>
     <message>
         <source>type</source>
         <translation>typ</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>seznam adresářů</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Seznam Adresářů
 
 zobrazí seznam adresářů a souborů</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>adresář</translation>
     </message>
     <message>
         <source>file</source>
         <translation>soubor</translation>
     </message>
     <message>
         <source>link</source>
         <translation>link</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Prosím čekejte...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation>Nelze vytvořit adresář
 .../Documents/application
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Nelze vytvořit adresář
 %1
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation>Nelze vytvořit adresář
 .../Documents/application/zsafe
 
 ZSafe se nyní ukončí.</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Nový dokument</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Otevřít dokument</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Uložit dokument jako..</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Uložit dokument</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>U&amp;ložit dokument s novým heslem</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>&amp;Export do textového souboru</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>&amp;Import z textového souboru</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Odstranit textový soubor</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Otevřít položky rozvinuté</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>K&amp;onec</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Soubor</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nový</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Upravit</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Smazat</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Vyjmout</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>K&amp;opírovat</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Vložit</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Hledat</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Položka</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;O aplikaci</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
         <source>New entry</source>
         <translation>Nová položka</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Upravit kategorii, nebo položku</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Smazat kategorii, nebo položku</translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation>Hledat položku</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentář</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Opravdu chcete smazat?</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">N&amp;emazat</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Upravit položku</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Uživatelské jméno</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Heslo</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Nová položka</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Název položky musí být jiný
+než název kategorie.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Hledat</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Položka nenalezena</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;OK</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished">Všechno</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished">Text</translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished">Odstranit textový soubor</translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Nelze odstranit textový soubor.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished">Dokument nebyl definován.
+Vytvořte nový dokument</translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished">Export do textového souboru</translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished">Import z textového souboru</translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Nelze exportovat do textového souboru.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Nelze importovat textový soubor.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Zadejte heslo</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Špatné heslo.
+
+ZSafe se nyní ukončí.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Špatné heslo.
+Zkusit znovu?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ano</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Ne.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Prázdný dokument,
+nebo špatné heslo.
+Pokračovat?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Ne</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ano.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Heslo je prázdné.
+Zadejte ho znovu.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Opakujte heslo</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Hesla musí být identická.
+Zadejte ho znovu.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished">Chcete uložit změny</translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished">
+před pokračováním?</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Uložit</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Neukládat</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Soubor s hesly uložen.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Chcete uložit změny
+před ukončením?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">U&amp;ložit s
+novým
+heslem</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Čekejte</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Shromažďování ikon...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Vytvořit nový ZSafe dokument</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished">Nyní prosím zadejte
+dvakrát heslo k vašemu
+nově vytvořenému dokumentu.</translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Otevřít ZSafe dokument</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Uložit ZSafe dokument jako..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Správce hesel&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe verze 2.1.2-jv01b&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">napsal Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Přeložil Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe verze 2.1.2&lt;br&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/addressbook.ts b/i18n/da/addressbook.ts
index c8f0078..435ae84 100644
--- a/i18n/da/addressbook.ts
+++ b/i18n/da/addressbook.ts
@@ -1,1513 +1,1517 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Fuldt navn</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Vælg</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Kort</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Start søgning</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Luk find</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Skriv mail til</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Send kontakt</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importer vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mine personlige detaljer</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Gem alle data</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Indstilling</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Korrekt fil-type?</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Den valgte fil 
  slutter ikke med &quot;.vcf&quot;.
  Er du sikker på du vil åbne den?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nej</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Tilføj kontakt?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Er du sikker på du vil tilføje kontakten for %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Alle ja</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan ikke redigere data da en synkronisering er igang</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Rediger adresse</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Rediger mine personlige detaljer</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakter - Mine personlige detaljer</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Ikke mere lager</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Kunne ikke gemme information.
 Frigør noget lagerplads
 og prøv igen.
 
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Ikke fundet</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Kunne ikke finde en kontakt med
 dette søge mønster!</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Kort</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Eksporter vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Du skal vælge en kontakt!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Du skal angive et filnavn!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Søge indstillinger</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Forespørgsels metode</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Brug regulære udtryk</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Brug wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Versalfølsom</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Lille</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Stor</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Post</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Foretræk QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Foretræk Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Bemærk: QT-Mail kan
 kun fås fra SHARP
 standard ROM&apos;en.
 Opie-Mail fås gratis!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Rækkefølge</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Vælg kontakt rækkefølgen:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Op</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klik på fanen for at vælge den</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Indstilling af søge metoder</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Søgefunktionen forventer regulære udtryk hvis denne er valgt</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Søgefunktionen forventer kun simple wildcards</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Hvis valgt, skelner søgningen mellem store og små bogstaver</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Skrift størrelse for liste og kort visning</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Skrift indstillinger for liste og kort visning</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Brug Sharp&apos;s mail program hvis det er tilgengæligt</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Brug OPIE mail hvis det er installeret</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Flyt den valgte attribut en linie op</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Flyt den valgte attribut en linie ned</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste over alle mulige attributter</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Tilføj den valgte attribut fra listen herunder til den øverste liste</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Fjern den valgte attribut fra den øverste liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Rækkefølge (op -&gt; ned) definerer den primære kontakt vist i den anden kolonne i listen</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Værktøjs-/Menulinje</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Faste</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Skift til faste menu-/værktøjslinjer efter programmet er genstartet!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Flytbare</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Skift til flytbare menu-/værktøjslinjer efter programmet er genstartet!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Fuldt navn...</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Job titel</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Noter...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generel</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Arbejde</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjem</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>City</source>
         <translation>By</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Stat</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postnummer</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>USA</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Storbritannien</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanien</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algeriet</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikansk Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australien</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Østrig</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahama</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Hviderusland</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgien</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvetø</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasilien</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarien</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Cayman-øerne</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Kina</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Juleøen</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cookøerne</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Elfenbenskysten</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Kroatien</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Cypern</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Tjekkiske Republik</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Danmark</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikanske Republik</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Østtimor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egypten</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Ækvatorialsk Guinea</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estland</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopien</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falklandsøerne</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Færøerne</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finland</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankrig</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Fransk Guyana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Fransk Polynesien</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgien</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Tyskland</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grækenland</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grønland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Vatikanstaten</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Ungarn</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Island</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indien</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesien</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irland</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italien</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordan</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Letland</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litauen</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxembourg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Makedonien</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaysia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldiverne</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritanien</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronesien</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongoliet</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marokko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Holland</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Ny Kaledonien</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>New Zealand</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norge</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Ny Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filippinerne</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumænien</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>St. Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi-Arabien</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellerne</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapore</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovakiet</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenien</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon-øerne</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Sydafrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanien</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Sverige</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Schweiz</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesien</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Tyrkiet</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Vestindiske Øer</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Vestsahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavien</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Fødselsdag</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Årsdag</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Køn</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kvinde</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Indtast note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Rediger navn</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Fornavn</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mellemnavn</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Efternavn</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffiks</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarktis</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenien</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Cameroun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kirgisistan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palæstinensiske selvstyre områder</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Tryk for at indtaste efter-, mellem- og fornavn</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>Indtast hele navnet direkte! Hvis du har et efternavn bestående af flere ord (f.eks. &quot;de la Guerra&quot;), så skriv &lt;efternavn&gt;, &lt;fornavne&gt; sådan: &quot;de la Guerra, Carlos Pedro&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Stillingsbetegnelse..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Noget i retning af &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Arbejdsstedet for kontakten</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Tryk for at vælge attributten du vil ændre</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Tryk for at vælge hvordan navnet skal gemmes (og hvordan det skal vises i liste visningen)</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Arbejdstelefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Arbejdsfax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Arbejdsmobil</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Standard email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Hjemmetelefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Hjemmefax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Hjemmemobil</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Kontor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Bestyrer</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Ægtefælle</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Køn</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Fødselsdag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Årsdag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Øgenavn</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Børn</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Navn titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Fornavn</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Mellemnavn</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Efternavn</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Suffiks</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Gem som</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Job titel</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Arbejds adresse</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Arbejds by</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Arbejds stat</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Arbejds postnummer</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Arbejds land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Arbejds personsøger</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Arbejds hjemmeside</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Hjemmeadresse</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Hjemmeby</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Hjemmestat</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Hjemmepostnummer</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Hjemmeland</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Hjemme website</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Noter</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libqpe.ts b/i18n/da/libqpe.ts
index 4bde867..606a169 100644
--- a/i18n/da/libqpe.ts
+++ b/i18n/da/libqpe.ts
@@ -1,962 +1,1024 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(flere)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Erhverv</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personlig</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Flere)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Ny Kategori</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Ny Kategori</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategori Redigering</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorier</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Program</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorier placeres her</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Vælg kategorierne som dette dokument tilhører.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Indtast en ny kategori her. Tryk &lt;b&gt;Tilføj&lt;/b&gt; for at tilføje den til listen.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Indtast en ny kategori til venstre og tryk for at tilføje den til listen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Tryk for at slette den valgte kategori.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Tjek afkrydsningsfeltet for at gøre denne egenskab tilgængelig for alle programmer.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Desværre! Et andet
 program er igang med at
 redigere kategorierne.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Redigér Kategorier</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Vis januar i det valgte år</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Vis foregående måned</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Vis næste måned</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Vis december i det valgte år</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Luk Filvælgeren</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Vis dokumenter af denne type</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokument visning</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Vis dokumenter i denne kategori</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klik for at vælge et dokument fra listen</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, eller vælg &lt;b&gt;Nyt Dokument&lt;/b&gt; for at lave et nyt dokument.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Klik og hold for at se dokumentets egenskaber.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Strengen blev ikke fundet.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Slutningen er nået. Starter fra begyndelsen</translation>
+        <translation type="obsolete">Slutningen er nået. Starter fra begyndelsen</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Find hvad:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Start søgning ved:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Versalfølsom</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Søg baglæns</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Egenskaber</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokument visning</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Fejl under sletning af filen.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopi af</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliker</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fejl under kopiering af filen.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Fejl under flytning af filen.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Brug brugerdefineret rotation</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Indlæs programmet på forhånd så det er klar til brug.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Navnet på dette dokument.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Mediet som dokumentet ligger på.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokation:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Hurtig indlæsning (bruger hukommelse)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Slet dette dokument.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Lav en kopi af dette dokument.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Send dette dokument til en anden enhed.</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Ejer information</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation></translation>
     </message>
     <message>
         <source>2</source>
         <translation></translation>
     </message>
     <message>
         <source>3</source>
         <translation></translation>
     </message>
     <message>
         <source>4</source>
         <translation></translation>
     </message>
     <message>
         <source>5</source>
         <translation></translation>
     </message>
     <message>
         <source>6</source>
         <translation></translation>
     </message>
     <message>
         <source>7</source>
         <translation></translation>
     </message>
     <message>
         <source>8</source>
         <translation></translation>
     </message>
     <message>
         <source>9</source>
         <translation></translation>
     </message>
     <message>
         <source>0</source>
         <translation></translation>
     </message>
     <message>
         <source>OK</source>
         <translation></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Indtast kode</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Nyt Dokument</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Der opstod at problem under
 oprettelsen af konfigurations
 informationen til dette program.
 
 Frigør noget lagerplads og
 prøv igen.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Kunne ikke oprette opstarts
 filer. Frigør noget lagerplads
 før du indtaster data</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Kunne ikke sætte alarmen.
 Frigør noget hukommelse og prøv igen.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation></translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>måned</translation>
     </message>
     <message>
         <source>year</source>
         <translation>år</translation>
     </message>
     <message>
         <source>PM</source>
         <translation></translation>
     </message>
     <message>
         <source>AM</source>
         <translation></translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Er du sikker på du vil slette
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Arbejds adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Hjemme adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Email adresser: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Hjemme telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Hjemme fax:  </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Hjemme mobil: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Hjemme webside: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Arbejds webside: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kontor: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Arbejds telefon: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Arbejds fax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Arbejds mobil: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Arbejds personsøger: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Erhverv: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Chef: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kvinde</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Køn: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ægtefælle: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Fødselsdag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Årsdag: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Øgenavn: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Navne titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Fornavn</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mellemnavn</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Efternavn</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffiks</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Job titel</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Arbejds telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Arbejds fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Arbejds mobil</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standard email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Hjemme telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Hjemme fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Hjemme mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Arbejds gade</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Arbejds by</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Arbejds stat</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Arbejds postnr.</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Arbejds land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Arbejds personsøger</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Arbejds webside</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Erhverv</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Chef</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Hjemme gade</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Hjemme by</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Hjemme stat</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Hjemme postnr.</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Hjemme land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Hjemme webside</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Ægtefælle</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Køn</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Fødselsdag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Årsdag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Øgenavn</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Børn</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupper</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Klik for at lukke dette vindue uden at gemme ændringer.</translation>
+        <translation type="obsolete">Klik for at lukke dette vindue uden at gemme ændringer.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Klik for at lukke dette vindue.</translation>
+        <translation type="obsolete">Klik for at lukke dette vindue.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Klik for at lukke dette vindue og anvende ændringer.</translation>
+        <translation type="obsolete">Klik for at lukke dette vindue og anvende ændringer.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Klik for at gøre dette vindue flytbart.</translation>
+        <translation type="obsolete">Klik for at gøre dette vindue flytbart.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Klik for at få dette vindue til at bruge hele skærmen.</translation>
+        <translation type="obsolete">Klik for at få dette vindue til at bruge hele skærmen.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Der findes ikke nogen omfattende hjælp til dette program, men der er stadig kontekstfølsom hjælp.&lt;p&gt;Sådan bruger du kontekstfølsom hjælp:&lt;p&gt;&lt;ol&gt;&lt;li&gt;klik og hold hjælpeknappen&lt;li&gt;når vindues titlen viser &lt;b&gt;Hvad er det...&lt;/b&gt;, så klik på det du vil have hjælp med.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Hvad er det...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Vil du slette(new line)
 %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Fejl</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokument</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Klik for at lukke dette vindue uden at gemme ændringer.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Klik for at lukke dette vindue.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Klik for at lukke dette vindue og anvende ændringer.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Klik for at få dette vindue til at bruge hele skærmen.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kort</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kort</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC Kort</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Harddisk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Intern Hukommelse</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Internt Lager</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>&apos;citytime&apos; programmet blev ikke fundet</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>For at vælge tidszoner,
 skal du installere &apos;citytime&apos;.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Kunne ikke planlægge alarmen.
 Frigør noget lagerplads og prøv igen</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 filer</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1 filer</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/qpe.ts b/i18n/da/qpe.ts
index f8cc1ea..978148f 100644
--- a/i18n/da/qpe.ts
+++ b/i18n/da/qpe.ts
@@ -1,518 +1,533 @@
 <!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">Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">Klik præcist midt på krydset
+        <translation type="unfinished">Klik præcist midt på krydset
 for at kalibrere din skærm.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">Velkommen til Opie</translation>
+        <translation type="unfinished">Velkommen til Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumenter</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Liste</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Batteri niveauet er kritisk!
 Hold enheden slukket indtil den får strøm igen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Batteriet er næsten tomt.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Back-up batteriet er næsten tomt.
 Genoplad venligst back-up batteriet.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">visitkort</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Batteristatus</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>FirstUseBackground</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">Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Intet program</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Der er ikke defineret noget program til dette dokument.&lt;p&gt;Typen er %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Finder dokumenter</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Søger dokumenter</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumenter</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Liste</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 filer</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Alle typer filer</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Dokument visning</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Medie indsat</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Et &lt;b&gt;lager medie&lt;/b&gt; blev indsat. Skal det skannes for medie filer?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Lyd</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Billede</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Link programmer</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Begræns søgning til mappe: (ikke ibrug endnu)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Tilføj</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Dit valg vil blive gemt på mediet.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Spørg ikke igen for dette medie</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Batteristatus</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>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Information</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">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Batteri niveauet er kritisk!
 Hold enheden slukket indtil den får strøm igen!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Back-up batteriet er næsten tomt.
 Genoplad venligst back-up batteriet.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">visitkort</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Luk ned</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Luk Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Genstart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Genstart Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Luk ned</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">&lt;p&gt;
 Disse muligheder er primært givet til brug under udvikling og test af Opie systemet. I et normalt miljø er dette unødvendigt.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Fortryd</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Luk ned...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Synkroniserings-forbindelse</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Et uautoriseret system ønsker adgang til denne enhed.&lt;p&gt;Hvis du bruger en Qtopia Desktop version ælder end 1.5.1 skal du opgradere.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Afvis</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">&lt;p&gt;Et ukendt system ønsker adgang til denne enhed.&lt;p&gt;Hvis det er første gang du synkroniserer er dette normalt.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Tillad</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Synkroniserer</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Kontakter&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Fortryd</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/security.ts b/i18n/da/security.ts
index 2fca576..a6cc677 100644
--- a/i18n/da/security.ts
+++ b/i18n/da/security.ts
@@ -1,243 +1,227 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Vælg kode</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Skift kode</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Indtast kode</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koden er forkert</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Den indtastede kode er forkert.
 Adgang nægtet</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Indtast ny kode</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Gentag ny kode</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Sikkerheds Indstillinger</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Skift kode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Slet kode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Spørg efter kode ved opstart</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synkronisering</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Tillad synkronisering fra netværk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (standard)</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ingen</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Beskyttelse med kode giver en minimal sikkerhed mod almindelig adgang til denne enhed.</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Kodeord</translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/da/zsafe.ts b/i18n/da/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/da/zsafe.ts
+++ b/i18n/da/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index d3dda2c..7741294 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -1,1515 +1,1519 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Kompletter Name</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Auswählen</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Adressen</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>E-Mail schreiben an</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Eintrag versenden</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>vCard importieren</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Persönliche Daten</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Während der Synchronisation ist das Bearbeiten nicht möglich</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Persönliche Daten ändern</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Adresse ändern</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Adressbuch - Meine persönlichen Daten</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nicht genügend Speicher</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Sicherung fehlgeschlagen
 Bitte sorgen Sie für mehr
 Speicherplatz und versuchen
 sie es erneut.
 
 Dennoch beenden?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>nicht zugewiesen</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Suche schließen</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Daten speichern</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nicht gefunden</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Karten</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Karte</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Suche starten</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Korrekter Dateityp ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Suchmuster konnte nicht gefunden werden !</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Die ausgewählte Datei endet
 nicht mit &quot;.vcf&quot;. 
 Wollen Sie sie trotzdem öffnen ?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Kontakt hinzufügen?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wollen Sie den Kontakt %1 wirklich
 hinzufügen?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Ja, alle</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>vCard exportieren</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Sie müssen einen Eintrag auswählen !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Sie müssen einen Dateinamen angeben !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Eingabemuster</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Benutze reguläre Ausdrücke</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Benutze Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Beachte Großschreibung</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Bevorzuge QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Bevorzuge Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Beachte: QT-Mail ist nur im Sharp 
 Default-Rom enthalten. Opie-Mail
 ist frei erhältlich !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Sucheinstellungen</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Reihenfolge</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Wähle Reihenfolge für Kontakt: </translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klicken sie auf den Reiter um diesen auszuwählen</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Einstellungen für den Typ der Suchstil</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Die Suchfunktion erwartet einen regulären Ausdruck, wenn dies ausgewählt wurde</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Die Suchfunktion erwartet ein simples Suchmuster</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Wenn dies ausgewählt wurde unterscheidet die Suche Groß- und Kleinschreibung</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Schriftgröße für Liste und Kartenansicht</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Schrifteinstellungen für Liste und Kartenansicht</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Sofern verfügbar wird Sharps Mailanwendung verwendet</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>OPIEs Mailanwendung wird verwendet</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Ausgewähltes Element eine Zeile nach oben verschieben</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Ausgewähltes Element eine Zeile nach unten verschieben</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste aller verfügbaren Elemente</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Hinzufügen des gewählten Elements von der unteren zur oberen Liste</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Entfernen des gewählten Elements aus der oberen Liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Reihenfolge (von oben nach unten) definiert den primären Kontakt der in der rechten Spalte angezeigt wird</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Werkzeug-/Menüleiste</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixiert</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Schalter für fixierte Werkzeugleiste - 
 wird nach dem Neustart der Anwendung aktiv!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Beweglich</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Schalter für bewegliche Werkzeugleiste - 
 wird nach dem Neustart der Anwendung aktiv!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mittlerer Name</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Voller Name...</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notizen...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Geschäftlich</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Privat</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Stadt</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Staat</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postleitzahl</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Vereinigte Staaten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Großbritannien</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanien</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algerien</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikanisch Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentinien</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australien</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Österreich</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Aserbaidschan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesch</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgien</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda-Inseln</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasilien</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarien</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodscha</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Kap Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Cayman Inseln</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Tschad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Weihnachtsinseln</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Kolumbien</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Komoren</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Kongo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Inseln</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Elfenbeinküste</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Kroatien</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Kuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Zypern</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Tschechei</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dänemark</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikanische Republik</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Ost-Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Ägypten</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Äquatorial Guinea</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estland</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Äthiopien</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falkland Inseln</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Färöer Inseln</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finnland</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankreich</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Franz. Guiana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Franz. Polynesien</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgien</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Deutschland</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Griechenland</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grönland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Vatikanstadt</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Ungarn</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Island</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indien</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesien</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irland</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italien</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanien</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kasachstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenja</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Lettland</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litauen</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Mazedonien</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaysia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malediven</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauretanien</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronesien</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldawien</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolei</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marokko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibien</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Niederlanden</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Neukaledonien</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Neuseeland</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norwegen</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Neu Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippinen</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ile La Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumänien</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi Arabien</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellen</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovakei</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenien</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon-Inseln</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Südafrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanien</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Sankt Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swasiland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Schweden</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Schweiz</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadschikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tansania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesien</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Türkei</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Usbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Jungfraueninseln</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Westsahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavien</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Sambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Notiz eingeben</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Namen ändern</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarktis</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenien</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivien</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kamerun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaika</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Inseln</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Hier Klicken, um Vor-, Mittel- und Nachnamen einzugeben</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>Geben Sie hier den vollen Namen direkt ein ! Wenn Ihr letzter Name aus mehreren Worten besteht (bspw. &quot;von der Vogelweide&quot;), schreiben Sie ihn bitte als &lt;Nachname&gt;,&lt;Vornamen&gt; wie bspw. &quot;von der Vogelweide, Walter Maria&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Die Berufsbezeichnug..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Suffixe wie bspw. &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Die Arbeitsstelle des Kontakts</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Hier Klicken um ein Attribut zu ändern</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Hier auswählen, wie der Name gespeichert wird (und wie er in der Liste erscheint)</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Tel. gesch.</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax gesch.</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Handy gesch.</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Standard-EMail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-Mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Priv. Telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Priv. Fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Priv. Handy</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Büro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Ehepartner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Kinder</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Mittlerer Name</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Speichern unter</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Abteilung</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Straße, gesch.</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Gesch. Stadt</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Gesch. Staat</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Gesch. PLZ</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Gesch. Land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Gesch. Pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Gesch. Web</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Priv. Straße</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Priv. Stadt</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Priv. Staat</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Priv. PLZ</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Priv. Land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Priv. Webseite</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notizen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libqpe.ts b/i18n/de/libqpe.ts
index ed69bc9..f1b814f 100644
--- a/i18n/de/libqpe.ts
+++ b/i18n/de/libqpe.ts
@@ -1,979 +1,1049 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugewiesen</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(Mehrere)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Geschäftlich</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Privat</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Mehrere)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Neue Kategorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Neue Kategorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategorie bearbeiten</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorien</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorien hier hinein</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Überprüfen Sie die Kategorie zu der dieses Dokument gehört.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Bitte geben Sie eine neue Kategorie ein. Drücken Sie &lt;b&gt;Neu&lt;/b&gt; um sie zur Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Sie können links eine neue Kategorie einfügen und durch Drücken von &lt;b&gt;Neu&lt;/b&gt; sie zur Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Hier drücken, um eine ausgewählte Kategorie zu entfernen.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Auswählen um diese Eigenschaft allen Anwendungen verfügbar zu machen.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugewiesen</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Eine andere Anwendung bearbeitet gerade 
 die Kategorien.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Kategorien bearbeiten</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Januar des ausgewählten Jahres anzeigen</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Vorherigen Monat anzeigen</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Nächsten Monat anzeigen</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Dezember des ausgewählten Jahres anzeigen</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Dateidialog schließen</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Dokumente dieses Typs anzeigen</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Dokumente dieser Kategorie anzeigen</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klicken, um ein Dokument aus der Liste auszuwählen</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, oder wählen Sie &lt;b&gt;Neues Dokument&lt;/b&gt;, um ein neues Dokument zu erstellen.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Klicken und Halten für die Dokumenteigenschaften.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Text nicht gefunden</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Ende erreicht, zurück zum Anfang</translation>
+        <translation type="obsolete">Ende erreicht, zurück zum Anfang</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Suchen nach: </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie: </translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Suche starten bei: </translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>2. Dez. 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Groß- und Kleinschreibung beachten</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Rückwärts suchen</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopie von</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Verschieben nicht möglich</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Eigenschaften</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Kommentar: </translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ: </translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort: </translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Schnellladen (benötigt Speicher)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Beamen</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Das Medium auf dem sich das Dokument befindet</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Der Dokumentname</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Vorsorgliches Laden der Anwendung für schnellere Verfügbarkeit.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Dokument löschen</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Dokument kopieren</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Dokument auf ein anderes Gerät beamen.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Anwendungsspezifische Rotation</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Benutzerinformationen</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Passwort eingeben</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Speicher erschöpft</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Ein Problem beim Erstellen 
 der Konfigurationsinformationen ist aufgetreten. 
 Bitte machen Sie entsprechenden Speicher frei 
 und versuchen Sie es noch einmal.
 </translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Erstellen der Startdateien nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 frei und versuchen Sie es noch einmal
 .
 </translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Setzen des Alarms nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 frei und versuchen Sie es noch einmal
 .
 </translation>
     </message>
     <message>
         <source>D</source>
-        <translation>T</translation>
+        <translation type="obsolete">T</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>J</translation>
     </message>
     <message>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Wollen Sie %1 wirklich entfernen ?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugeordnet</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse gesch.&lt;/b&gt;: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse priv.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Mail Adresse: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. priv.: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax priv.: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Handy priv.: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Web priv.: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web gesch.: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Gesch.Tel.: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Gesch. Fax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Gesch. Handy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Gesch. Pager:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Vorgesetzter: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geschlecht: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jahrestag: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Spitzname: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Zweitname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ablegen als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Abteilung</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tel. gesch.</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax gesch.</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Handy gesch.</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standardmail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Mailadressen</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tel. priv.</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax priv.</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Handy priv.</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Straße gesch.</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Stadt gesch.</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Land gesch.</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>PLZ gesch.</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Staat gesch.</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pieper gesch.</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web gesch.</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Vorgestzter</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Strasse priv.</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Stadt priv.</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Land priv.</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>PLZ priv.</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Staat priv.</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web priv.</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Partner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinder</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Neues Dokument</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Die</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mit</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Don</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Son</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu verwerfen.</translation>
+        <translation type="obsolete">Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu verwerfen.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Klicken Sie hier, um das Fenster zu schließen.</translation>
+        <translation type="obsolete">Klicken Sie hier, um das Fenster zu schließen.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu akzeptieren.</translation>
+        <translation type="obsolete">Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu akzeptieren.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Klicken Sie hier, um das Fenster verschiebbar zu machen.</translation>
+        <translation type="obsolete">Klicken Sie hier, um das Fenster verschiebbar zu machen.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Klicken sie hier, um das Fenster zu maximieren.</translation>
+        <translation type="obsolete">Klicken sie hier, um das Fenster zu maximieren.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Keine allgemeine Hilfe vorhanden- bitte benutzen Sie die kontextsensitve Hilfe:&lt;p&gt;Um kontextsensitive Hilfe zu verwenden: &lt;p&gt;&lt;ol&gt;&lt;li&gt;Klicken und halten Sie den Stift auf dem Hilfeknopf.&lt;li&gt;Wenn die Titelzeile &lt;b&gt;What&apos;s this...&lt;/b&gt; anzeigt können Sie auf ein beliebiges Objekt klicken um die zugehörige Hilfe zu erhalten.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Was ist das...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Sind Sie sicher, dass die %1 löschen wollen?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Fehler</translation>
     </message>
     <message>
         <source>Could not find the application </source>
         <translation type="obsolete">Konnte die Anwendung nicht finden</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>Could not start the application </source>
         <translation type="obsolete">Konnte die Anwendung nicht starten</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">T</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 Dokument</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu verwerfen.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Klicken Sie hier, um das Fenster zu schließen.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu akzeptieren.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Klicken sie hier, um das Fenster zu maximieren.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF-Karte</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Festplatte</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD-Karte</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Festplatte</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>interner Speicher</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>interner Hauptspeicher</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC-Karte</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Citytime-Programm nicht gefunden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Bitte installieren Sie opie-citytime 
 zur Einstellung der Zeitzonen.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Kein Speicher vorhanden</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Setzen des Alarms nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 frei und versuchen Sie es noch einmal
 .
 </translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 Dateien</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1-Dateien</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index f0c5680..51b0933 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -1,360 +1,387 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Zeit und Datum</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Persönliche Informationen</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Anwendungsproblem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 antwortet nicht.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Möchten Sie die Anwendung abbrechen?&lt;/p&gt;</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>&lt;qt&gt;&lt;p&gt;Schnellladen wurde für diese Anwendung ausgeschaltet. Tippen sie lange auf das Anwendungssymbol, um es wieder anzuschalten.&lt;/qt&gt;</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>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; wurde mit Signalcode %2 beendet&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Anwendung beendet</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Anwendung nicht gefunden</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Konnte Anwendung &lt;b&gt;%1&lt;/b&gt; nicht finden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Konnte die Anwendung %1 nicht finden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Batteriestatus</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Geringe Batteriestärke</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Zurück</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Weiter &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Berühren Sie den Bildschirm irgendwo, um weiter zu machen.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Bitte warten, lade %1 Einstellungen.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Bitte warten...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
         <translation>ErstBenutzungsHintergrund</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Fertig</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Keine Anwendung</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Es ist keine Anwendung für dieses Dokument des Typs %1 definiert&lt;/p&gt;.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Als Text betrachten</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Finde Dokumente...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Symbol-Ansicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Listenansicht</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>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Alle Typen</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>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Sicherer Modus</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Qtopia neu starten</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Hilfe...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</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>&lt;p&gt;Das Systemdatum scheint nicht gültig zu sein.
 (%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es anpassen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Der Batteriestatus ist kritisch!
 Schließen Sie das Gerät schnellst 
 möglich an die Stromversorgung an!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
         <translation type="obsolete">Batterie nahezu erschöpft.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Die Ersatzbatterie ist schwach.
 Bitte laden Sie sie auf.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Visitenkarte</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Sicherer  Modus</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>&lt;P&gt;Es trat ein Fehler beim Systemstart ein, das System ist nun im sicheren Modus. Plugins wurden nicht geladen. Sie können die kritischen Plugins im Plugin Manager ausschalten.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Speicher Status</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Knapper Speicher
 Bitte Daten sichern.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Kritische Speicherknappheit
 Bitte diese Anwendung 
 sofort beenden.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Herunterfahren</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Opie beenden </translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Opie neu starten</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Herunterfahren</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>Die Optionen zum Herunterfahren sind ausschließlich zur Entwicklung und für Tests des Opie-Systems gedacht. Unter normalen Bedingungen sind sie nicht notwendig.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Herunterfahren...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Synchronisationsverbindung</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Ein nicht authorisiertes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie eine Version von Qtopia Desktop verwenden die älter ist als 1.5.1 sollten Sie ein Upgrade in Betracht ziehen.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Verweigern</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Ein nicht erkanntes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie gerade eben zum ersten Mal eine Synchronisation gestartet haben, ist diese Meldung normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Erlauben</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>Abbruch</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronisiere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index df9e796..693dcc0 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -1,266 +1,250 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Passwort einstellen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Passwort eingeben</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Passwort falsch</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Das eingegebene Passwort ist falsch. Zugriff verwehrt</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Neues Passwort eingeben</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Passwort erneut eingeben</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Sicherheitseinstellungen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Passwort löschen</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Passwort muss beim Starten 
 eingegeben werden</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchroniseren</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Synchronisierung gestatten aus dem Netzwerk:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Keine</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Das Passwort bietet einen minimalen Schutz, 
 sollte jemand unerwünscht Zugriff auf dieses 
 Gerät erhalten.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (Standard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Automatisch einloggen</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/de/zsafe.ts b/i18n/de/zsafe.ts
index 5233a01..82bddfa 100644
--- a/i18n/de/zsafe.ts
+++ b/i18n/de/zsafe.ts
@@ -1,827 +1,839 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished">ZSafe Version 2.1.2&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe Version 2.1.2&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>ComboBox DateitypFilter
 Bearbeiten oder auswählen des Filters</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>bestätigt die Auswahl und schließt den Dialog</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OKKnopf</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>verwirft die Auswahl und schließt den Dialog</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>AbbruchKnopf</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>zeigt den ausgewählten Dateinamen</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Dateinamen Zeileneditor
 
 Zeigt die ausgewählte Zeile
 und erlaubt die direkte
 Dateinamen Eingabe</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>ComboBox Verzeichnis
 Bearbeiten oder auswählen des Verzeichnisnamens</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Verzeichnis Listenansicht
 
 Zeigt die Liste der Verzeichnisse und Dateien</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>Verz</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.0&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.1.0&lt;br&gt;</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe Version 2.1.2&lt;br&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/addressbook.ts b/i18n/dk/addressbook.ts
index 13a7cdc..ac13c74 100644
--- a/i18n/dk/addressbook.ts
+++ b/i18n/dk/addressbook.ts
@@ -1,1336 +1,1340 @@
 <!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>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close 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>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>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</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>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</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>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</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>Not Found</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>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <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>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</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>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>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</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>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>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</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</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</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</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>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</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>File As</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>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>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</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>Afghanistan</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>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</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>Bolivia</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>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</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>France</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>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</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>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</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>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</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>Norway</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>Palestinian Sovereign Areas</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>Pitcairn Islands</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>Vietnam</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>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</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>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>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/dk/libqpe.ts b/i18n/dk/libqpe.ts
index a84a335..41353fc 100644
--- a/i18n/dk/libqpe.ts
+++ b/i18n/dk/libqpe.ts
@@ -1,939 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</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>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </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>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>Nickname: </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>Groups</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/dk/security.ts b/i18n/dk/security.ts
index d60f914..1530ddb 100644
--- a/i18n/dk/security.ts
+++ b/i18n/dk/security.ts
@@ -1,230 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</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>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/dk/zsafe.ts b/i18n/dk/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/dk/zsafe.ts
+++ b/i18n/dk/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index ea20241..ad6d227 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -1,1336 +1,1340 @@
 <!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>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</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>
 </TS>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index 9929ffe..cc02e37 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -1,939 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </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>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>Nickname: </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>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Document</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>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index 7bc5e05..c2aa1c4 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -1,334 +1,361 @@
 <!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>
+    <message>
+        <source>Welcome to Opie</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>FirstUseBackground</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>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>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 8b69c6f..9dbe05b 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -1,230 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</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>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</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>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode</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>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/zsafe.ts b/i18n/en/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/en/zsafe.ts
+++ b/i18n/en/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index c6bf2d1..2d0a595 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -1,1514 +1,1518 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nombre Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Elige</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escribir correo a</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Emitir entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mis datos personales</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar mis datos personales</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Dirección</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Mis Datos Personales</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Incapaz de guardar la información.
 Libere algo de espacio e
 inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar busqueda</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Guardar datos</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Tarjetas</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>No Encontrado</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Tarjeta</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Iniciar búsqueda</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>¿Tipo fichero correcto?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sí</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>¡Incapaz de encontrar un contacto
 con ese patrón de búsqueda!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>El fichero seleccionado
 no termina en &quot;.vcf&quot;.
 ¿Seguro que quiere abrirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>¿Añadir contacto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>¿Seguro que quiere añadir el contacto para 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Sí a &amp;todo</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exportar vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>¡Tiene que seleccionar un contacto!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>¡Tiene que elegir un nombre de fichero!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Estilo consulta</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usar expresiones regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar comodines (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Prefiere QT-Mail </translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Prefiere Opie-Mail</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configuración de Búsqueda</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Aviso: QT-Mail sólo se
 suministra en la Rom de
 SHARP. ¡Opie-Mail se
 suministra gratis!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Orden</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Seleccionar orden de contactos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bajar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Pulse tab para seleccionar uno</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Configuración del estilo de búsqueda</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>El botón de búsqueda espera una expresión regular al selecionarse</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>El botón de búsqueda espera sólo comodines simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Si lo selecciona, la búsqueda diferencia entre mayúsculas y minúsculas</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Tamaño de letra para la vista en lista y tarjetas</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Configuración de letras para la vista en lista y tarjetas</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Use la aplicación de correo de Sharp si está disponible</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Use el correo de OPIE si está instalado</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Sube los atributos seleccionados una línea</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Baja los atributos seleccionados una línea</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista de todos los atributos disponibles</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Añade el atributo seleccionado de la lista inferior a la lista superior</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Borra el atributo seleccionado de la lista superior</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Orden (arriba-&gt;abajo) que define el contacto principal que se muestra el la segunda columna en la vista en lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Herramienta-/Barra de menú</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Arreglado</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>¡Cambie entre menu fijo-/barra de herramientas después de reiniciar la aplicación!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Movible</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>¡Cambie a menú-/barra de herramientas después de reiniciar la aplicación!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincia</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nombre...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organización</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Gran Bretaña</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japón</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemania</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introducir Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nombre</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Argelia</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Antillas</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Acerballán</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belice</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudas</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhután</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Isla Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darusalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Camboya</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Islas Caimán</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Isla de Navidad</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comodo</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Isla Cook</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Costa d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croacia</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Chipre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Checoslovaquia</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dinamarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>República Dominicama</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Oriental</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinea Ecuatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopía</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Isla Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Islas Feroes</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlandia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guayana Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinesia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabón</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guayana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>El Vaticano</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hungría</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islandia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituania</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macao</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malasia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malvinas</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauricio</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayote</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronesia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldavia</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Monserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marruecos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Países Bajos</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nueva Caledonia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nueva Zelanda</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Omán</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistán</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papúa Nueva Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Perú</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polonia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumanía</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucía</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabia Saudí</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leona</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Eslovaquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Eslovenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Islas Solomon</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Sudáfrica</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>España</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Santa Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudán</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swazilandia</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suecia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suiza</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailandia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Túnez</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquía</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrania</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Islas Vírgenes</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yugoslavia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afganistán</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antártida</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Camerún</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Ginea-Bisau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Islas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pulse para introducir nombre y apellidos</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>¡Introduzca el nombre completo directamente! Si los apellidos son varias palabras, por favor, escriba &lt;apellidos&gt;, &lt;nombres&gt; como en &quot;Fernández Barros, José Luis&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>El cargo..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Algo como &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>El lugar de trabajo del contacto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pulse para seleccional el atributo a cambiar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pulse para seleccionar cómo almacenar el nombre (y cómo mostrarlo el la vista en lista)</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Tfno. trabajo</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax trabajo</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Móvil trabajo</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Correo-e</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Correos-e</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Teléfono casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Móvil personal</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Superior</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Género</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Hijos</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Archivar como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Cargo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Compañía</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Calle trabajo</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Ciudad trabajo</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Provincia trabajo</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Cód.postal trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">País trabajo</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Busca trabajo</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Web trabajo</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Calle casa</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Cód.postal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Web personal</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 8cc20ab..b0f4c99 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -1,961 +1,1031 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Trabajo</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nueva categoría</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nueva categoría </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Editar Categoría</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorías</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicación</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Aquí van las categorías</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Verificar las categorías a las que pertenece este documento.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Introduzca una nueva categoría aquí. Pulse &lt;b&gt;Añadir&lt;/b&gt; para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Introduzca una nueva categoría a la izquierda y pulse para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pulse para borrar la categoría resaltada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Verificar que esta propiedad está disponible en todas las aplicaciones.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Lo siento, otra aplicación está
 editando las categorías.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorías</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostar Enero del año seleccionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostar el mes anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostar el mes siguiente</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostar Diciembre del año seleccionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Cerrar selección fichero</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostar documentos de este tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostar documentos de esta categoría</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Pulse para seleccionar un documento de la lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, o selecione &lt;b&gt;Nuevo dcumento&lt;/b&gt; para crearlo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Mantenga pulsado para las propiedades del documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Cadena no encontrada.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Final alcanzado, empezando por el principio</translation>
+        <translation type="obsolete">Final alcanzado, empezando por el principio</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Qué buscar:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Iniciar búsqueda el:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dic 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Buscar hacia atrás</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Falló al borrar fichero.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copiar de </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fallo al copiar fichero.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Fallo al mover documento.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentario:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localización:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carga rápida (consume memoria)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>El medio en el que reside el documento.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>El nombre de este documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Precargar esta aplicación para disponibilidad instantánea.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Borrar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Hacer una copia de este documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emitir este documento a otro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotación personalizada</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Información del propietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introduzca código</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Hubo un problema creando
 la información de configuración
 de este programa.
 
 Por favor, libere espacio e
 inténtelo de nuevo.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Incapaz de crear ficheros de inicio.
 Por favor, libere espacio antes
 de introducir datos</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e intételo de nuevo.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">¿Seguro que quiere borrar
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Correos-e: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Móvil personal: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Web personal: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apodo: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2º nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apellidos</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Compañía</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Teléfono trabajo</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax trabajo</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Móvil trabajo</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Correo-e omisión</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Correos-e</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Teléfono casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Móvil personal</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Calle trabajo</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ciudad trabajo</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Provincia trabajo</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CP trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País trabajo</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Busca trabajo</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web trabajo</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Superior</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Calle casa</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Cód.portal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web personal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Hijos</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuevo documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Pulse para cerrar esta ventana, descartando los cambios.</translation>
+        <translation type="obsolete">Pulse para cerrar esta ventana, descartando los cambios.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Pulse para cerrar esta ventana.</translation>
+        <translation type="obsolete">Pulse para cerrar esta ventana.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Pulse para cerrar esta ventana y aplicar los cambios.</translation>
+        <translation type="obsolete">Pulse para cerrar esta ventana y aplicar los cambios.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Pulse para hacer esta ventana móvil.</translation>
+        <translation type="obsolete">Pulse para hacer esta ventana móvil.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
+        <translation type="obsolete">Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qué es esto...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;¿Seguro que quiere borrar
 %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Ene</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>May</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Error</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Pulse para cerrar esta ventana, descartando los cambios.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Pulse para cerrar esta ventana.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Pulse para cerrar esta ventana y aplicar los cambios.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Tarjeta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Tarjeta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco duro SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Almacenamiento interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Tarjeta MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>no encontré el ejecutable Reloj Mundial</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Para elegir las zonas horarias, por favor
 instale el Reloj Mundial (citytime).</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e inténtelo de nuevo</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos los %1 ficheros</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos los ficheros</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index 525b0f7..804219f 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,518 +1,533 @@
 <!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">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">Pulse las crucecitas firmemente y con
+        <translation type="unfinished">Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">Bienvenido a Opie</translation>
+        <translation type="unfinished">Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Ver como lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">La batería está muy baja.</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">tarjeta de visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Estado de la Batería</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>FirstUseBackground</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">Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documentos</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Ver como lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Ver como documentos</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Medio insertado</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Vídeo</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Enlace a aplicaciones</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limitar búsqueda al directorio: (no se usa aún)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Añadir</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Su decisión será guardada en el medio.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Estado de la Batería</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>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Información</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">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">tarjeta de visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Apagar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Conexión de sincronización</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Denegar</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Permitir</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
     </message>
     <message>
         <source>&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">&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index d5a9334..5533dcb 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -1,263 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Fijar código</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introducir código</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Código Incorrecto</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>El código introducido es incorrecto.
 Acceso denegado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Teclee nuevo código</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Reintroduzca nuevo código</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configuración de Seguridad</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Borrar código</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Solicitar código al encender</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sincronización desde red:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (predefinido)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ninguna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Código</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Identificación</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Identificación automática</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/es/zsafe.ts b/i18n/es/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/es/zsafe.ts
+++ b/i18n/es/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index 08b3656..e3ad591 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -1,1523 +1,1527 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nom complet</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Sélectionner</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Ecrire un e-mail à</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Transmettre entrée</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Informations personnelles</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Edition non autorisée,&lt;br&gt;
 synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editer informations personnelles</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editer contact</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacts - Informations personnelles</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Mémoire saturée</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossible de sauvegarder&lt;br&gt;
 Libérez de la mémoire&lt;br&gt;
 et réessayez&lt;br&gt;
 &lt;br&gt;
 Quitter tout de même ?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Toutes</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classée</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importer vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fermer recherche</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Enregistrer toutes les données</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Non trouvé</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Fiches</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Fiche</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Démarrer recherche</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Type du fichier valide ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="obsolete">Aucun contact ne correspond
 à cette expression !</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Le fichier selectionné&lt;br&gt;
 ne se termine pas par &quot;.vcf&quot;.&lt;br&gt;
 Voulez-vous vraiment l&apos;ouvrir ?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Ajouter contact ?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Voulez-vous vraimment&lt;br&gt;
 ajouter un contact pour&lt;br&gt;
 %1 ?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Oui pour &amp;tous</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exporter vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Vous devez sélectionner&lt;br&gt;
 un contact !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Vous devez entrer&lt;br&gt;
 un nom de fichier !</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Aucun contact trouvé !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Type de requête</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Utiliser les expressions régulières</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Utiliser des jokers (*, ?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensible à la casse</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Courrier</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Préferer QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Préferer Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Note : QT-Mail est fourni dans la ROM
 par défaut de SHARP. Opie-Mail est
 founi gratuitement !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Préférences recherche</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petite</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordre</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Ordre de recherche de contact : </translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Cliquez un onglet pour le sélectionner</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Paramètres du type de recherche</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Si sélectionné, le champ Recherche attend une expression régulière</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Le champ Recherche utilise de simples jokers</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Si sélectionné, la recherche différencie majuscules et minuscules</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Taille des polices des vues liste et fiche</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Paramètres des polices des vues liste et fiche</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Utiliser l&apos;application de messagerie de Sharp si disponible</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Utiliser Opie-Mail si installé</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Déplace le champ sélectionné d&apos;une ligne vers le haut</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Déplace le champ sélectionné d&apos;une ligne vers le bas</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste des champs disponibles</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Ajoute le champ sélectionné dans la liste juste au-dessus</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Supprime le champ sélectionné de la liste du dessus</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>L&apos;ordre (haut -&gt; bas) définit le premier élément affiché dans la deuxième colonne en mode liste</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Outils-/Barre de Menus</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixe</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Utiliser un menu-/barre d&apos;outils fixe après redémarrage de l&apos;application !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobile</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Utiliser un menu-/barre d&apos;outils déplaçable après redémarrage de l&apos;application !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Classer sous</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Pays</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nom entier...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Note...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Code Postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Etats Unies</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grande Bretagne</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japon</translation>
     </message>
     <message>
         <source>France</source>
         <translation>France</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Allemagne</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvège</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editer nom</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanie</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algérie</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>American Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorre</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentine</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australie</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Autriche</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahreïn</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbade</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Biélorussie</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgique</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Bénin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudes</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhoutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Ile Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brésil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarie</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodge</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cap Vert</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Iles Cayman</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Tchad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chilie</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Chine</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Iles Christmas</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombie</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comores</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Ile Cook</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Cote d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croatie</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Chypre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>République Tchèque</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Danemark</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominique</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>République Dominicaine</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Oriental</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equateur</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egypte</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinée Equatoriale</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrée</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonie</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Ethiopie</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Iles Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Iles Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlande</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guyane Française</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polynésie Française</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambie</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgie</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltare</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grèce</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Greenland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenade</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinée</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyane</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haïti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Saint Siège</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hongrie</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islande</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Inde</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonésie</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irelande</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italie</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanie</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kénya</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Corée</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Lettonie</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Liban</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lithuanie</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxembourg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macédoine</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaisie</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldives</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malte</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritanie</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Maurice</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexique</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronésie</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldavie</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolie</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Maroc</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibie</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Népal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Pays-Bas</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nouvelle Calédonie</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nouvelle Zélande</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigéria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Belau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papouasie Nouvelle Guinée</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Pérou</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippines</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Pologne</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ile de la Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Roumanie</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russie</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Sainte-Lucie</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marin</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabie Saoudite</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Sénégal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapour</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovaquie</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovénie</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Iles Salomon</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalie</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Afrique du Sud</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Espagne</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Hélène</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Soudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suède</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suisse</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzanie</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thaïlande</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunisie</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquie</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Ouganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Vénézuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Iles Vierges</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Occidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yougoslavie</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambie</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de Naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Koweit</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antartique</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Arménie</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivie</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Cameroun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinée-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaïque</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Zone de souveraineté Palestinienne</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Iles Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Cliquez ce bouton pour saisir nom, prénom et second prénom</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>Entrez le nom complet directement ! Si le nom est composé de plusieurs mots (par exemple &quot;De Gaulle&quot;), saisissez &lt;Nom&gt;,&lt;Prénom&gt; comme ceci : &quot;De Gaulle, Général&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Fonction dans l&apos;entreprise..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Par exemple &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Le lieu de travail du contact</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Cliquez dessus pour sélectionnez les attributs à modifier</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Permet de choisir le format du nom complet (et comment il s&apos;affiche en mode liste)</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Tél (Bur.)</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax (Bur.)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Mobile (Bur.)</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email par défaut</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Tél (Dom.)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax (Dom.)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Mobile (Perso.)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Service</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Assistant(e)</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Responsable</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Epou(x|se)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Type</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Date de Naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Surnom</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Enfant(s)</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Lister sous</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Fonction</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Département</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Société</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Rue (Bur.)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Ville (Bur.)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Département (Bur.)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Code Postal (Bur.)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Pays (Bur.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Alphapage (Bur.)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Page Web (Bur.)</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Rue (Dom.)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Ville (Dom.)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Département (Dom.)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Code Postal (Dom.)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Pays (Dom.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Page Web (Perso.)</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Note</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index 7df48f4..a2f5164 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -1,1015 +1,1066 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Toute</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classée</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Professionelle</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personnelle</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nouvelle catégorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nouvelle catégorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Edition des catégories</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Catégories</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Application</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Les catégories vont ici</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globale</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Cochez les catégories auquelles ce document appartient.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Entrez une nouvelle catégorie ici. Pressez &lt;b&gt;Ajouter&lt;/b&gt; pour l&apos;ajouter à la liste.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Entrez une nouvelle catégorie à gauche et pressez pour l&apos;ajouter à la liste.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Cliquez pour effacer la catégorie surlignée.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Cochez pour rendre cette propriété disponible aux autres applications.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vide</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Désolé, une autre application
 est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editer catégories</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Afficher Janvier dans l&apos;année
 sélectionnée</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Afficher le mois précédent</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Afficher le mois suivant</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Afficher Décembre dans l&apos;année
 sélectionnée</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fermer le sélecteur de fichiers</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Afficher les documents de ce type</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue &quot;Document&quot;</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Afficher les documents
 dans cette catégorie</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Cliquez pour sélectionner un document
 de cette liste</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, ou sélectionnez &lt;b&gt;Nouveau Document&lt;/b&gt;&lt;br&gt;pour créer un nouveau document.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Cliquez et restez appuyé pour accéder&lt;br&gt;aux propriétés du document.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>La chaîne n&apos;a pas été trouvée.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Fin atteinte, reprise au début</translation>
+        <translation type="obsolete">Fin atteinte, reprise au début</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Rechercher : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Débuter la recherche à : </translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>01 Dec 02</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Respecter la casse</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Recherche en sens inverse</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vue Document</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Echec suppression fichier.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copie de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Echec copie fichier.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Echec déplacement fichier.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disque dur</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Infos : </translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Emplacement : </translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Chargement rapide
 (consomme de la mémoire)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emettre</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Le média sur lequel le document est placé.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Le nom du document.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Pré-charger cette application pour qu&apos;elle soit disponible instantanément.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Supprimer ce document.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Faire une copie de ce document.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Transmettre ce document à un autre dispositif.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Personnaliser la rotation</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Information propriétaire</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entrez mot de passe</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plus de mémoire</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Un problème est survenu lors de
 la création des informations de
 configuration du programme.
 
 Veuillez libérer de la mémoire et 
 ré-essayez.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Impossible de créer les fichiers
 de départ. Veuillez libérer de la
 mémoire avant d&apos;entrer des
 données</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Programmation alarme impossible.
 Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>J</translation>
+        <translation type="obsolete">J</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Etes-vous sûr de vouloir effacer
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classée</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse (bur.)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse (Dom.)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Adresses e-mails : </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tél (dom): </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax (dom): </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobile (perso.): </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Page Web (perso.): </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Page Web (bur.): </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Service : </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Téléphone (bur.): </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax (bur.): </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobile (bur.): </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Alphapage (bur.): </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistant(e): </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Conjoint : </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Date de naissance: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversaire : </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Surnom : </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Fichier sous</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Téléphone (bur.)</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax (bur.)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobile (bur.)</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail par défaut</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tél (dom.)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (dom.)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobile (dom.)</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Adresse (bur.)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ville (bur.)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Département (bur.)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Code Postal (bur.)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Pays (bur.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Alphapage (bur.)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Page Web (bur.)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Service</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistant(e)</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Rue (dom.)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ville (dom.)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Etat (dom.)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Code Postal (dom.)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Pays (dom.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Page Web (dom.)</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Conjoint</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Enfant(s)</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Groupes</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nouveau document</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lu</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Me</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Je</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ve</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Avr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Aoû</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Déc</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Cliquez pour fermer cette fenêtre et abandonner les modifications.</translation>
+        <translation type="obsolete">Cliquez pour fermer cette fenêtre et abandonner les modifications.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Cliquez pour fermer cette fenêtre.</translation>
+        <translation type="obsolete">Cliquez pour fermer cette fenêtre.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Cliquez pour fermer cette fenêtre et appliquer les modifications.</translation>
+        <translation type="obsolete">Cliquez pour fermer cette fenêtre et appliquer les modifications.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Cliquez pour rendre cette fenêtre déplaçable.</translation>
+        <translation type="obsolete">Cliquez pour rendre cette fenêtre déplaçable.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
+        <translation type="obsolete">Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;L&apos;aide globale n&apos;est pas disponible pour cette application, cependant, il existe une aide contectuelle.&lt;p&gt;Pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez et maintenez la pression sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel élément.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qu&apos;est ce que...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Voulez-vous vraiment supprimer
 %1 ?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Erreur</translation>
     </message>
     <message>
         <source>Could not find the application </source>
         <translation type="obsolete">L&apos;application n&apos;a pas été trouvée</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>Could not start the application </source>
         <translation type="obsolete">L&apos;application n&apos;a pas été lancée</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">J</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="obsolete">&lt;Qt&gt;L&apos;aide globale n&apos;est pas disponible pour cette application, cependant, il existe une aide contectuelle.&lt;p&gt;Pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez et maintenez la pression sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel élément.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="obsolete">Qu&apos;est ce que...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Cliquez pour fermer cette fenêtre et abandonner les changements.</translation>
+        <translation type="unfinished">Cliquez pour fermer cette fenêtre et abandonner les changements.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation type="obsolete">Cliquez pour fermer cette fenêtre.</translation>
+        <translation type="unfinished">Cliquez pour fermer cette fenêtre.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Cliquez pour fermer cette fenêtre et appliquer les changements.</translation>
+        <translation type="unfinished">Cliquez pour fermer cette fenêtre et appliquer les changements.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="obsolete">Clqiuez pour rendre cette fenêtre déplaçable.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
+        <translation type="unfinished">Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Carte CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disque dur</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Carte SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disque dur SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Disque interne</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Mémoire interne</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Carte MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Impossible de trouver l&apos;exécutable
 &quot;Heure de Ville&quot;</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Pour choisir le fuseau horaire,
 installez &quot;Heure de Ville&quot; SVP.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plus de mémoire</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Programmation alarme impossible.
 Libérez de la mémoire et réessayez</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fichiers</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Tous fichiers %1</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tous les fichiers</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 6cb81d9..be3789d 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,525 +1,540 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Heure et date</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Information personnelle</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Onglet Document</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problème application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 ne répond pas.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Voulez-vous forcer l&apos;application à quitter ?&lt;/p&gt;</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>&lt;qt&gt;&lt;p&gt;Le chargement rapide a été désactivé pour cette application. Cliquez et maintenez la pression sur l&apos;icône pour la réactiver.&lt;/qt&gt;</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>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; a été terminée par le signal %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Application terminée</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Application non trouvée</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Problème de l&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 ne répond pas.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Voulez-vous forcer l&apos;application à quitter?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">Cliquez sur la croix fermement et
+        <translation type="unfinished">Cliquez sur la croix fermement et
 avec précision pour calibrer l&apos;écran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">Bienvenue sur Opie</translation>
+        <translation type="unfinished">Bienvenue sur Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documents</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Vue Icône</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Vue Liste</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Le niveau de batterie est critique !
 Eteigner la machine jusqu&apos;à ça recharge !</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Le niveau de batterie est très bas.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La niveau de la batterie de sauvegarde est très bas.
 Veuillez rechargez la batterie de sauvegarde.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">business card</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Status batterie</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Batterie faible</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Précédent</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Suivant &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Cliquez sur l&apos;écran pour continuer.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Chargement de la configuration de %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Veuillez patienter...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
         <translation>Premier arriere plan</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Terminer</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Lanceur</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Lanceur</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Pas d&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Aucune application définie pour ce document.&lt;p&gt;Type %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Recherche de documents</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Recherche de documents</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Ouvrir avec l&apos;éditeur de texte</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Recherche documents...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vue Icône</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vue Liste</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>&lt;b&gt;L&apos;onglet Documents&lt;p&gt;a été désactivé.&lt;p&gt;Utilisez Paramètres-&gt;Lanceur-&gt;Onglet Document&lt;p&gt;pour le réactiver.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">Fichiers %1</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Tous les fichiers</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue Document</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Tous types</translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Media inséré</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Un &lt;b&gt;média de stockage&lt;/b&gt; a été inséré. Doit-il être parcouru à la recherche de fichiers?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Quels fichiers</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Vidéo</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Tous</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Lier apps</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limiter la recherche au répertoire: (pas encore utilisé)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Votre choix va être enregistré sur le média.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Ne plus demander pour ce média</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Status Batterie</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Mode sans échec</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestionnaire plugins...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Redémarrer Qtopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Aide...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</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>&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Le niveau de batterie est critique !
 Eteigner la machine jusqu&apos;à ça recharge !</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
         <translation type="obsolete">Battery très faible.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La niveau de la batterie de sauvegarde est très bas.
 Veuillez rechargez la batterie de sauvegarde.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>carte de visite</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Mode sans échec</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>&lt;P&gt;Une erreur s&apos;est produite lors du démarrage et le système est maintenant en mode sans échec. Les plugins ne sont pas démarrés en mode sans échec. Vous pouvez utiliser le Gestionnaire de Plugin pour désactiver le ou les plugins causant l&apos;erreur.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestionnaire plugins...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Status mémoire</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Ressource mémoire faible
 Sauvegardez vos données.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Ressource mémoire critique!!!
 Vous devriez fermer cette
 application immédiatement.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>ATTENTION</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;Le niveau de batterie est critique !&lt;p&gt;Eteigner la machine et connectez la pour la recharger</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>La niveau de battery est très faible.</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>&lt;p&gt;La niveau de la batterie de sauvegarde est très faible.&lt;p&gt;Veuillez la rechargez ou la remplacer</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Terminer</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminer Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Redémarrer Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Arrêter</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;Ces options sont destinés à être utilisées durant le développement et les tests du système Opie. Dans des conditions normales d&apos;utilisation, ces concepts ne sont pas nécessaires.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Arrêt...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Connexion syncho</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous utiliser une version de &quot;Qtopia Desktop&quot; plus vieille que 1.5.1, vous devriez la mettre à jour.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Refuser</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous venez juste de démarrer une synchronisation pour la 1ère fois, c&apos;est normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Autoriser</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>&lt;p&gt;Un systeme non autorisé demande l&apos;accès à ce périphérique.&lt;p&gt;Si vous utiliser une version de &quot;Qtopia Desktop&quot; plus ancienne que la 1.5.1, vous devriez la mettre à jour ou changer les paramètres de sécurité pour utiliser IntelliSync.</translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Synchronisation en cours</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contacts&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Annuler</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronise : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index 7fed920..f32d971 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -1,292 +1,300 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Entrer le
 mot de passe</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Changer le
 mot de passe</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Mot de passe incorrect</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Le mot de passe est incorrect.
 Accès refusé</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Entrer le nouveau mot de passe</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Réentrez le mot de passe</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Attention</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation>&lt;p&gt;Tous les paramètres utilisateurs seront perdus.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation>192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation>1.0.0.0/8</translation>
     </message>
     <message>
         <source>WARNING</source>
-        <translation>ATTENTION</translation>
+        <translation type="obsolete">ATTENTION</translation>
     </message>
     <message>
         <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation>&lt;p&gt;Sélectionnez IntelliSync ici désactivera le mot de passe FTP.&lt;p&gt;Chaque machine de votre sous réseau pourra se synchroniser avec votre Zaurus!</translation>
+        <translation type="obsolete">&lt;p&gt;Sélectionnez IntelliSync ici désactivera le mot de passe FTP.&lt;p&gt;Chaque machine de votre sous réseau pourra se synchroniser avec votre Zaurus!</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Paramètres de sécurité</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Changer le
 mot de passe</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Effacer le
 mot de passe</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Demander le mot de passe au démarrage</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronisation</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accepter la synchronisation par réseau de : </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Aucun</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Ce mot de passe vous permet de protéger l&apos;accès à votre organiseur.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (par défaut)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Mot de Passe</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Nom de connexion</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Connexion automatique</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation>Ce bouton vous permet de changer le mot de passe de sécurité
 
 Note : Ne pas confondre avec le mot de passe de synchronisation.</translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation>Supprimer le mot de passe courant.
 Vous pourrez en entrer un nouveau à n&apos;importe qu&apos;elle moment.</translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation>Si vous activez cette option, un mot de passe sera demandé après chaque allumage du Zaurus.</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>Si vous activez cette option, opie-login vous ouvrira automatiquement une session avec le nom d&apos;utilisateur de la liste déroulante.
 
 Pour le Zaurus 5x00 c&apos;est toujours l&apos;utilisateur &quot;root&quot;.</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>Cette liste déroulante vous permet de sélectionnez le nom d&apos;utilisateur à utiliser lors de l&apos;ouverture de session automatique.
 
 Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</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>Sélectionnez une plage d&apos;adresses IP.
 
 Cette liste déroulante vous permet de sélectionnez qui du réseau peut se connecter à votre Zaurus.
 
 Par exemple, une plage d&apos;adresses du type  192.168.1.0/24 permettra aux machines ayant une adresse IP entre 192.168.1.1 et  192.168.1.254 de se connecter (et se synchroniserà avec le Zaurus.
 
 L&apos;option &quot;Tous&quot; permet à *toutes* adresse IP de se connecter.
 L&apos;option &quot;Aucun&quot; empêchera *toutes* adresse IP de se connecter.
 
 Si vous n&apos;êtes pas sur, sélectionnez &quot;Tous&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Supprimer entrée</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>Supprime la plage d&apos;adresse IP de la liste.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>Paramètres par défaut</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>Ce bouton restaure une liste de plage IP par défaut.
 
 Attention : Toutes les plages d&apos;adresse IP entrées manuellement seront perdus!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Sélectionnez votre logiciel de synchronisation</translation>
     </message>
     <message>
         <source>QTopia</source>
-        <translation>QTopia</translation>
+        <translation type="obsolete">QTopia</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation>IntelliSync</translation>
     </message>
     <message>
         <source>This option changes the login behaviour of the internal FTP server.  
 
 If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
 
 The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
-        <translation>Cette option change la façon dont le serveur FTP interne accepte les connections.
+        <translation type="obsolete">Cette option change la façon dont le serveur FTP interne accepte les connections.
 
 Si vous avez un problème de synchronisation, essayez le paramètrage &quot;IntelliSync&quot; qui acceptera tous les mots de passe reçu sur le port de synchronisation (FTP).
 
 Le paramètrage par défaut est Qtopia. Il permet de se connecter en tant qu&apos;utilisateur &quot;root&quot; et comme mot de passe &quot;Qtopia&quot;.
 
 Attention : les mots de passe sont sensibles à la case (i.e HeLLo est différent de Hello).</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation>Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation>Opie 1.0</translation>
     </message>
     <message>
         <source>Both</source>
-        <translation>Les deux</translation>
+        <translation type="obsolete">Les deux</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/fr/zsafe.ts b/i18n/fr/zsafe.ts
index 3cf039e..8de2641 100644
--- a/i18n/fr/zsafe.ts
+++ b/i18n/fr/zsafe.ts
@@ -1,831 +1,891 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation>ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Voulez-vous effacer?</translation>
+        <translation type="obsolete">Voulez-vous effacer?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Effacer</translation>
+        <translation type="obsolete">&amp;Effacer</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Ne pas effacer</translation>
+        <translation type="obsolete">&amp;Ne pas effacer</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Modifier l&apos;entrée</translation>
+        <translation type="obsolete">Modifier l&apos;entrée</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nom</translation>
+        <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Identifiant</translation>
+        <translation type="obsolete">Identifiant</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Mot de passe</translation>
+        <translation type="obsolete">Mot de passe</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation>Commentaire</translation>
+        <translation type="obsolete">Commentaire</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation>Champ 4</translation>
+        <translation type="obsolete">Champ 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation>Champ 5</translation>
+        <translation type="obsolete">Champ 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Nouvelle entrée</translation>
+        <translation type="obsolete">Nouvelle entrée</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Le nom de l&apos;entrée doit être
+        <translation type="obsolete">Le nom de l&apos;entrée doit être
 différent de celui de la catégorie.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Rechercher</translation>
+        <translation type="obsolete">Rechercher</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Entrée non trouvée</translation>
+        <translation type="obsolete">Entrée non trouvée</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <translation type="obsolete">&amp;OK</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation>Champ 1</translation>
+        <translation type="obsolete">Champ 1</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation>Champ 3</translation>
+        <translation type="obsolete">Champ 3</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Tous</translation>
+        <translation type="obsolete">Tous</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Texte</translation>
+        <translation type="obsolete">Texte</translation>
     </message>
     <message>
         <source>Remove text file</source>
-        <translation>Supprimer fichier texte</translation>
+        <translation type="obsolete">Supprimer fichier texte</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Impossible de supprimer le fichier texte.</translation>
+        <translation type="obsolete">Impossible de supprimer le fichier texte.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
-        <translation>Aucun document défini.
+        <translation type="obsolete">Aucun document défini.
 Vous devez en créer un nouveau</translation>
     </message>
     <message>
         <source>Export text file</source>
-        <translation>Exporter vers un fichier texte</translation>
+        <translation type="obsolete">Exporter vers un fichier texte</translation>
     </message>
     <message>
         <source>Import text file</source>
-        <translation>Importer un fichier texte</translation>
+        <translation type="obsolete">Importer un fichier texte</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Impossible d&apos;exporter vers un fichier texte.</translation>
+        <translation type="obsolete">Impossible d&apos;exporter vers un fichier texte.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Impossible d&apos;importer le fichier texte.</translation>
+        <translation type="obsolete">Impossible d&apos;importer le fichier texte.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Saisir mot de passe</translation>
+        <translation type="obsolete">Saisir mot de passe</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Mot de passe incorrect
+        <translation type="obsolete">Mot de passe incorrect
 
 ZSafe va s&apos;arrêter.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Mot de passe incorrect.
+        <translation type="obsolete">Mot de passe incorrect.
 Le saisir à nouveau?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Oui</translation>
+        <translation type="obsolete">&amp;Oui</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Non.</translation>
+        <translation type="obsolete">&amp;Non.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Document vide ou
+        <translation type="obsolete">Document vide ou
 mot de passe incorrect.
 Continuer ?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Non</translation>
+        <translation type="obsolete">&amp;Non</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Oui.</translation>
+        <translation type="obsolete">&amp;Oui.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Le mot de passe est vide.
+        <translation type="obsolete">Le mot de passe est vide.
 Veuillez le saisir de nouveau.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Re-saisir mot de passe</translation>
+        <translation type="obsolete">Re-saisir mot de passe</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Les mots de passe doivent être identiques.
+        <translation type="obsolete">Les mots de passe doivent être identiques.
 Veuillez les saisir de nouveau.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
-        <translation>Voulez-vous enregistrer</translation>
+        <translation type="obsolete">Voulez-vous enregistrer</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
-        <translation>
+        <translation type="obsolete">
 avant de poursuivre ?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Enregistrer</translation>
+        <translation type="obsolete">&amp;Enregistrer</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Ne pas enregistrer</translation>
+        <translation type="obsolete">&amp;Ne pas enregistrer</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Fichier de mot de passe sauvegardé.</translation>
+        <translation type="obsolete">Fichier de mot de passe sauvegardé.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Voulez-vous enregistrer
+        <translation type="obsolete">Voulez-vous enregistrer
 avant de sortir ?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Enregistrer avec
+        <translation type="obsolete">Enregistrer avec
 nouveau mot
 de &amp;Passe</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Catégorie</translation>
+        <translation type="obsolete">Catégorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Boîte d&apos;attente</translation>
+        <translation type="obsolete">Boîte d&apos;attente</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Rassemblement des icônes...</translation>
+        <translation type="obsolete">Rassemblement des icônes...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Créer nouveau document ZSafe</translation>
+        <translation type="obsolete">Créer nouveau document ZSafe</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
-        <translation>Vous devez maintenant saisir
+        <translation type="obsolete">Vous devez maintenant saisir
 deux fois le même mot de passe
 pour votre nouveau document.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Ouvrir document ZSafe</translation>
+        <translation type="obsolete">Ouvrir document ZSafe</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Enregistrer document ZSafe sous..</translation>
+        <translation type="obsolete">Enregistrer document ZSafe sous..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Gestionnaire Zaurus de mots de passe&lt;br&gt;</translation>
+        <translation type="obsolete">Gestionnaire Zaurus de mots de passe&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation>ZSafe version 2.1.2-jv01b&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe version 2.1.2-jv01b&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>par Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">par Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Traductions par Christophe Amrein-Marie et Michael Opdenacker&lt;br&gt;</translation>
+        <translation type="obsolete">Traductions par Christophe Amrein-Marie et Michael Opdenacker&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation>ZSafe version 2.1.2&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe version 2.1.2&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Icône</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Champ 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Champ 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Champ 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Champ 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Champ 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information :</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nouvelle entrée</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Champ 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>FileDlg</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Sélection du type de fichier</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Editer le ComboBox FileTypeFilter ou sélectionnez le filtre</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>Confirmer la sélection et refermer le formulaire</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OKButton</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>Annuler la sélection et fermer le formulaire</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>CancelButton</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>affiche le nom du fichier sélectionné</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Filename LineEdit
 
 affiche le fichier sélectionné
 et permet de modifier son nom</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>ComboBox Directory
 Modifier ou sélectionner les noms de répertoires</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Affichage du répertoire sous forme de liste</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Directory ListView
 
 affiche la liste des répertoires et fichiers</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>rép</translation>
     </message>
     <message>
         <source>file</source>
         <translation>fichier</translation>
     </message>
     <message>
         <source>link</source>
         <translation>lien</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Veuillez patienter...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Impossible de créer le répertoire
 %1
 
 ZSafe va s&apos;arrêter.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Enregistrer document</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Enregistrer document avec nouveau mot de &amp;passe</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>E&amp;xporter vers fichier texte</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>&amp;Importer fichier texte</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Supprimer fichier texte</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Ouvrir les entrées expansées</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Modifier</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Supprimer</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>C&amp;atégorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Couper</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>C&amp;opier</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Coller</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Rechercher</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Entrée</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;A propos</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Champ 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Champ 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Champ 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Nouveau document</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Ouvrir document</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Enregistrer document sous..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.0&lt;br&gt;</source>
         <translation type="obsolete">ZSafe version 2.1.0&lt;br&gt;</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation>Impossible de créer le répertoire
 .../Documents/application
 
 ZSafe va s&apos;arrêter.</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation>Impossible de créer le répertoire
 .../Documents/application/zsafe
 
 ZSafe va s&apos;arrêter.</translation>
     </message>
     <message>
         <source>New entry</source>
         <translation>Nouvelle entrée</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Modifier la catégorie ou l&apos;entrée</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Supprimer la catégorie ou l&apos;entrée</translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation>Rechercher entrée</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished">Tous</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished">Texte</translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished">Supprimer fichier texte</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished">Aucun document défini.
+Vous devez en créer un nouveau</translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished">Exporter vers un fichier texte</translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished">Importer un fichier texte</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished">Voulez-vous enregistrer</translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished">
+avant de poursuivre ?</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished">Vous devez maintenant saisir
+deux fois le même mot de passe
+pour votre nouveau document.</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe version 2.1.2-jv01b&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe version 2.1.2&lt;br&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index 9373605..5f5450f 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -1,1514 +1,1518 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Teljes név</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kapcsolat</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Felvesz</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kapcsolatok</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kapcsolat</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Keres</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Levelet küld</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Bejegyzést átsugároz</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Az én személyes adataim</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Nézet</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Az adat nem szerkeszthető, szinkronizálás folyamatban</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Az én személyes adataim szerkesztése</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Cím szerkesztése</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kapcsolatok - Az én személyes adataim</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nem lehet az információkat menteni.
 Szabadítson fel némi helyet
 és próbálja újra.
 
 Mégis kilép?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>vCard importálása</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Keresés bezárása</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Minden adat mentése</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Beállítás</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nem található</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Névjegyek</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Névjegy</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Kezdj keresni</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Helyes fájltípus ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Igen</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nem</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Ehhez a keresési mintához
 nem találok kapcsolatot!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>A kiválasztott fájl
 nem &quot;.vcf&quot;-re végződik.
 Tényleg meg akarja nyitni?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Kapcsolat hozzáadása?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Tényleg hozzá akarja adni
 %1-t a kapcsolatokhoz?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Mind igen</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Keresési mód</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Szabályos kifejezés használata</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Helyettesítők (*,?) használata</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kis- és nagybetű érzékeny</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Levél</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>QT-Mail preferálása</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Opie-Mail preferálása</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Megjegyzés: A QT-Mail program
 csak a SHARP alapértelmezett
 ROM-jában található. Az Opie-Mail
 ingyenesen elérhető !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Keresési beállítások</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Betűk</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Kicsi</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normál</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Nagy</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Sorrend</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Kapcsolatok sorrendjének kiválasztása:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Fel</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Le</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eltávolít</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Beállítás</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>Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Kiterjesztés</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Rögzít mint</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Beosztás</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Város</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Állam</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Ország</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Teljes név...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Szervezet</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Jegyzetek...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Általános</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Üzleti</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Otthoni</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Cím</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Irányítószám</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Egyesült Államok</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Egyesült Királyság</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japán</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Franciaország</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Németország</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvégia</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Férfi</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Nő</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Jegyzet beírása</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Név szerkesztése</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kapcsolatok</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albánia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikai Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentína</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Ausztrália</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Ausztria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbajdzsán</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamák</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Banglades</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbadosz</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarusszia</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgium</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bután</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botszvána</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Sziget</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brazília</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgária</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundia</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodzsa</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Kajmán Szigetek</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Csile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Kína</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Karácsony Szigetek</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Kolumbia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Komorosz</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Kongó</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Szigetek</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Cote d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Horvátország</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Kuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Ciprus</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Csehország</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dánia</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominika</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikai Köztársaság</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Kelet Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ekvádor</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egyiptom</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Egyenlítői Ginea</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Észtország</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiópia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falkland Szigetek</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Faroe Szigetek</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finnország</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Francia Gajana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Francia Polinézia</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltár</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Görögország</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Greenland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Ginea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Magyarország</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Iceland</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonézia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Írország</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Izrael</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Olaszország</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordánia</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazahsztán</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Lettország</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litvánia</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Makaó</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Makedónia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaszkár</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malájzia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldives</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Málta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritánia</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexikó</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronézia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongólia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marokkó</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambik</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namíbia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepál</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Hollandia</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Új Kaledónia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Újzéland</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nikaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigéria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niua</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Omán</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakisztán</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Pápua Új Gínea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paragváj</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippines</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Lengyelország</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugália</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Románia</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Oroszország</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Saint Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Szaudarábia</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Szenegál</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Szingapúr</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Szlovákia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Szlovénia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon Szigetek</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Szomália</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Dél Afrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanyolország</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Szudán</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Svédország</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Svájc</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Tajvan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzánia</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thaiföld</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunézia</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Törökország</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenisztán</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukrajna</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Urugváj</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Üzbegisztán</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Virgin Szigetek</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Nyugati Szahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoszlávia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Születésnap</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Évforduló</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuvait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afganisztán</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarktisz</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenica</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolívia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kamerun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Gána</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaika</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kirabiti</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kirgizsztán</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palesztín Szuverén Területek</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcaim Szigetek</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnám</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>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Üzleti telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Üzleti fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Üzleti mobil</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Alapértelmezett e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-mailek</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Lakás telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Lakás fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Lakás mobil</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Iroda</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Szakma</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Titkár</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Hitves</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Nem</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Születésnap</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Évforduló</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Becenév</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Gyerekek</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Megszólítás</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Kiterjesztés</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Rögzít mint</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Beosztás</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Részleg</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Cég</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Üzleti cím</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Üzleti város</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Üzleti állam</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Üzleti irányítószám</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Üzleti ország</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Üzleti személyhívó</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Üzleti weblap</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Lakás utca</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Lakás város</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Lakás állam</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Lakás irányítószám</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Lakás ország</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Lakás weblap</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Jegyzetek</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libqpe.ts b/i18n/hu/libqpe.ts
index f1ac981..e49eabd 100644
--- a/i18n/hu/libqpe.ts
+++ b/i18n/hu/libqpe.ts
@@ -1,959 +1,1029 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(több.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Üzleti</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Személyes</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Több.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Új kategória</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Új kategória</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategória szerkesztése</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategóriák</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Alkalmazás</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Ide jönnek a kategóriák</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globális</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Válassza ki a kategóriákat melyekhez ez a dokumentum tartozik.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Ide írja be az új kategóriát. Nyomja meg a &lt;b&gt;Hozzáad&gt; gombot a listába illesztéshez.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Írja be az új kategóriát baloldalra és nyomja meg a listába illesztéshez.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Nyomja meg a kijelölt kategória törléséhez.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Ikszelje be, hogy a tulajdonság elérhető legyen minden alkalmazásnak.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Sajnálom, de egy másik alkalmazás
 már szerkeszti a kategóriákat.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Kategóriák szerkesztése</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Január mutatása a kiválasztott évben</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Előző hónap mutatása</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Következő hónap mutatása</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>December mutatása a kiválasztott évben</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fájlválasztó lezárása</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Jelen típusú dokumentumok mutatása</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentum nézet</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Ebben a kategóriában lévő dokumentumok mutatása</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Bökjön a listából kiválasztani kívánt dokumentumra</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, vagy válassza az &lt;b&gt;Új Dokumentum&lt;b&gt;ot új létrehozásához.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Bökjön és tartsa a dokumentum tulajdonságaihoz.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Név</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Keres</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Szöveg nem található.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Végére értem, kezdem előről</translation>
+        <translation type="obsolete">Végére értem, kezdem előről</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Keresés</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Mit keressen:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategória:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Keresés indulása innen:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kis- és nagybetűérzékeny</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Keresés visszafelé</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentum nézet</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Fájl törlése sikertelen.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Másolata ennek</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikál</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fájl másolás sikertelen.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Dokumentum mozgatása sikertelen.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Merevlemez</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Tulajdonságok</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Megjegyzés:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Típus:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Gyorindítás (memóriát fogyaszt)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Másol</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Átsugároz</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>A dokumentumot tároló média.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Ennek a dokumentumnak a neve.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Az alkalmazás előtöltése, hogy azonnal elérhető legyen.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Jelen dokumentum törlése.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Jelen dokumentum másolása.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Jelen dokumentum átsugárzása másik eszközre.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Egyedi forgatás használata</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Tulajdonos adatai</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Rendben</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Adja meg a kódot</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Jelen program beállítási adatainak
 elkészítésekor hiba történt.
 
 Kérem szabadítson fel némi helyet
 és próbálja meg újra.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Nem tudom az induló fájlokat létrehozni
 Kérem szabadítson fel némi helyet
 mielőtt adatokat vinne be</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Nem tudom az ébresztést beütemezni.
 Szabadítson fel némi memóriát és próbálja újra.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>N</translation>
+        <translation type="obsolete">N</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>H</translation>
+        <translation type="obsolete">H</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>É</translation>
     </message>
     <message>
         <source>day</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>month</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>year</source>
         <translation>év</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Du</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Va</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Biztosan törli
 %1-t?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Munkahely címe:&lt;b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Lakás címe:&lt;b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>E-mail címe:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Lakás telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Lakás fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Lakás mobil:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Lakás weblap:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Üzleti weblap:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Iroda:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Üzleti telefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Üzleti fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Üzleti mobil:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Üzleti személyhívó:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Szakma:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Titkár:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Férfi</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Nő</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Nem:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Hitves:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Születésnap:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Évforduló:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Becenév:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Megszólítás</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Toldalék</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Tárolás így</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Munka megnevezése</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Osztály</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Cég</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Üzleti telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Üzleti fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Üzleti mobil</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Alapértelmezett e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mailek</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Lakás telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Lakás fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Lakás mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Üzleti cím (utca)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Üzleti cím (város)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Üzleti cím (állam)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Üzleti cím (irányítószám)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Üzleti cím (ország)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Üzleti személyhívó</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Üzleti weblap</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Iroda</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Szakma</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Titkár</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Lakás cím (utca)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Lakás cím (város)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Lakás cím (állam)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Lakás cím (irányítószám)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Lakás cím (ország)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Lakás weblap</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Hitves</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Születésnap</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Évforduló</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Becenév</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Gyerekek</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Jegyzetek</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Csoportok</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Új dokumentum</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished">Bökjön ide jelen ablak bezárásához és a változások elvetéséhez.</translation>
+        <translation type="obsolete">Bökjön ide jelen ablak bezárásához és a változások elvetéséhez.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation type="unfinished">Bökjön ide jelen ablak bezárásához.</translation>
+        <translation type="obsolete">Bökjön ide jelen ablak bezárásához.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished">Bökjön ide jelen ablak bezárásához és a változások elmentéséhez.</translation>
+        <translation type="obsolete">Bökjön ide jelen ablak bezárásához és a változások elmentéséhez.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation type="unfinished">Bökjön ide, hogy mozgathatóvá tegye ezt az ablakot.</translation>
+        <translation type="obsolete">Bökjön ide, hogy mozgathatóvá tegye ezt az ablakot.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished">Bökjön ide, hogy ez az ablak használjon minden elérhető képernyőterületet.</translation>
+        <translation type="obsolete">Bökjön ide, hogy ez az ablak használjon minden elérhető képernyőterületet.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished">&lt;Qt&gt;Ehhez az alkalmazáshoz nincs átfogó súgó, azonban összefüggés-érzékeny van.&lt;p&gt;Az összefüggés-érzékeny súgó használatához:&lt;p&gt;&lt;ol&gt;&lt;li&gt;bökjün a súgó gombra és tartsa.&lt;li&gt;amikor a &lt;b&gt;Mi ez...&lt;/b&gt; cím megjelenik, bökjön bármely vezérlőre.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished">Mi ez...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Hiba</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">N</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">H</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokumentum</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Bökjön ide jelen ablak bezárásához és a változások elvetéséhez.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Bökjön ide jelen ablak bezárásához.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Bökjön ide jelen ablak bezárásához és a változások elmentéséhez.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Bökjön ide, hogy ez az ablak használjon minden elérhető képernyőterületet.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kártya</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Merevlemez</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kártya</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI merevlemez</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Belső tároló</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Belső memória</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC kártya</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>városidő futtatható állomány nem található</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Ahhoz, hogy az időzónákat kiválassza,
 kérem telepítse fel a városidő (citytime) programot.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nem tudom az ébresztést beütemezni.
 Szabadítson fel némi memóriát és próbálja újra</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fájl</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Mind a %1 fájl</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Minden fájl</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index 218e360..86e3986 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -1,510 +1,525 @@
 <!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">Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">Érintse meg pontosan és határozottan
+        <translation type="unfinished">Érintse meg pontosan és határozottan
 a kereszteket a képernyő kalibrálásához.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">Üdvözli önt az Opie</translation>
+        <translation type="unfinished">Üdvözli önt az Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Dokumentumok</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Listanézet</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Az elem szintje kritikus!
 Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Az elem kezd kimerülni.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">A biztonsági-elem szintje nagyon alacsony.
 Kérem töltse fel a biztonsági-elemt.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">névjegykártya</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Információ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Elem állapot</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>FirstUseBackground</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">Indító</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Indító</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Nincs alkalmazás</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Ehhez a dokumentumhoz nincs alkalmazás megadva.&lt;p&gt;Típusa: %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumentumok</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Listanézet</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 fájl</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Minden fájltípus</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Dokumentum nézet</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Eszköz betéve</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Egy &lt;b&gt;tároló eszközt&lt;/b&gt; helyezett a gépbe. Keressek rajta média fájlokat?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Mely média fájlokat</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Hang</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Kép</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Szöveg</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Videó</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Minden</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Csatold az alkalmazásokat</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Keresés korlátozása a könyvtárra: (még nem használt)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Hozzáad</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">A választása az eszközön lesz tárolva.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Ennél az eszköznél ne kérdezze újra</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Elem állapot</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>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Információ</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">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Az elem szintje kritikus!
 Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">A biztonsági-elem szintje nagyon alacsony.
 Kérem töltse fel a biztonsági-elemt.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">névjegykártya</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Bezárás</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Opie bezárása</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Újraindít</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Opie újraindítása</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Leállítás</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">&lt;p&gt;
 Ezeka bezárási lehetőségek elsősorban az Opie fejlesztése és tesztelése céljából vannak. Egy normális környezetben ezek feleslegesek.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Mégsem</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Leállítás...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Szinkronizációs kapcsolat</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha a Qtopia Desktop 1.5.1-es verziójánál régebbit használ, kérjük frissítsen.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Megtagad</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">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha éppen most telepítette a Szinkronozálót először, ez normális.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Engedélyez</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Szinkronizálás</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Címlista&lt;b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Mégsem</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/security.ts b/i18n/hu/security.ts
index 8b69c6f..9dbe05b 100644
--- a/i18n/hu/security.ts
+++ b/i18n/hu/security.ts
@@ -1,230 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</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>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</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>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode</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>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/hu/zsafe.ts b/i18n/hu/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/hu/zsafe.ts
+++ b/i18n/hu/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index 59c86f6..084c939 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -1,1515 +1,1519 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contatto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Scelta</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contatto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Scrivi Email A</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importa vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Informazioni Personali</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Modifica Dati Personali</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Modifica Dati</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatti - Dati Personali</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossibile salvare i dati.
 Liberare dello spazio
 e riprovare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartellini</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Chiudi Trova</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Salva tutti i Dati</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Non Trovato</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Cartellino</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Inizia Ricerca</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Giusto tipo di file?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sì</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Impossibile trovare un contatto con questo 
  criterio di ricerca!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Il nome del file selezionato 
  non termina con &quot;.vcf&quot;.
  Vuoi veramente aprirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Aggiungi Contatto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Vuoi veramente aggiungere un contatto per 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Tutti Sì</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Esporta vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Devi selezionare un contatto !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Devi impostare un nome file !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Stile Ricerca</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usa Espressioni Regolari</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usa Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Maiuscole/minuscole</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Scegli QT-Mail </translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Scegli Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Nota: QT-Mail è inserito 
 nella ROM della SHARP. 
 Opie-Mail viene invece
 rilasciato gratuitamente!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Impostazioni Ricerca</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordine</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Seleziona Ordine Visualizzazione:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Premi sul tab per selezionarne uno</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Impostazioni per lo stile della ricerca</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Il widget Cerca si aspetta, se selezionate, espressioni regolari</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Il widget Cerca si aspetta solo semplici wildcards</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Se selezionato, cerca differenze tra caratteri in minuscolo e maiuscolo</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Dimensione Font size per vista della lista e della card</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Impostazioni Font per vista della lista e della card</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Utilizza il client mail della Sharp se disponibile</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Utilizza il client mail di OPIE se installato</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Sposta l&apos;attributo selezionato una riga sopra</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Sposta l&apos;attributo selezionato una riga sotto</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Mostra tutti gli attributi disponibili</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Aggiungi l&apos;attributo selezionato dalla lista inferiore alla lista di superiore</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Elimina l&apos;attributo selezionato dalla lista superiore</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Ordine (sopra -&gt; sotto) definisce la visualizzazione dei contatti principali nella seconda colonna della vista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Tool-/Menubar</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fisso</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Cambia su menu-/toolbar fissi dopo aver riavviato l&apos;applicazione !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobile</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Cambia su menu-/toolbar mobili dopo aver riavviato l&apos;applicazione !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizzazione</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Note...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Lavoro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Città</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>CAP</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Paese</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Stati Uniti</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Regno Unito</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algeria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgio</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Island</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasile</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambogia</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Capo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Isole Cayman</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Cile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Cina</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Christmas Island</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Island</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Costa D&apos;Avorio</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croazia</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Cipro</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Repubblica Ceca</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Danimarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Repubblica Dominicana</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor East</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egitto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinea Equatoriale</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Isole Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Isole Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlandia</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guinea Francese</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinesia Francese</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Germania</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibilterra</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Ungheria</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islanda</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israele</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Giappone</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Giordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituania</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Lussemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaysia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldive</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Messico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronesia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marocco</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambico</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Paesi Bassi</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nuova Caledonia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nuova Zelandia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvegia</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nuova Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Perù</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filippine</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polonia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portogallo</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Romania</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabia Saudita</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapore</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovacchia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Isole Salomone</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Sud Africa</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spagna</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Svezia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Svizzera</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailandia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunisia</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turchia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucraina</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Isole Vergini</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Western Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Yugoslavia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Inserisci Note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Modifica Nome</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarctica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Cameroon</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestinian Sovereign Areas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Isole Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Premi pre inserire cognome e nome</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>Inserisci il nome completo direttamente ! Se hai un cognome con più parole (per esempio &quot;di Filippo&quot;), scrivi per favore &lt;cognome&gt;,&lt;nomi&gt; come: &quot;di Filippo, Francesco&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Titolo..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Qualcosa come &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Il posto di lavoro del contatto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Premi per selezionare l&apos;attributo da cambiare</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Premi per selezionare come registrare il nome (e come visualizzarlo nella vista)</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Tel. Lavoro</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax Lavoro</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Cell. Lavoro</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Altre Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Tel. Abitazione</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax Abitazione</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Cell. Abitazione</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Lavoro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Professione</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Direttore</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Coniuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sesso</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Alias</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Figli</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Visualizza come</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Dipartimento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Società</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Indirizzo Lavoro</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Città Lavoro</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Stato Lavoro</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">CAP Lavoro</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Paese Lavoro</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Cercapersone Lavoro</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Pagina Web Lavoro</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Indirizzo Abitazione</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Città Abitazione</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Stato Abitazione</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">CAP Abitazione</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Paese Abitazione</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Note</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index fe3ab53..faeec58 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -1,963 +1,1033 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Lavoro</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personale</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nuoca Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nuoca Categoria</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Modifica Categoria</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Applicazione</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorie Vanno Qui</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Totali</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Controllare le categorie a cui questo documento appartiene.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Inserisci una nuova categoria.  Premi &lt;b&gt;Aggiungi&lt;/b&gt; per aggiungerla alla lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Inserisci una nuova categoria sulla sinistra e premi per aggiungerla alla lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Premi per cancellare la categoria evidenziata.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Spunta per rendere questa proprietà disponibile a tutte le applicazioni.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Spiacente, un&apos;altra applicazione sta
 modificando le categorie.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Modifica Categorie</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostra Gennaio nell&apos;anno selezionato</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostra il mese precedente</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostra il mese successivo</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostra Dicembre nell&apos;anno selezionato</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Chiudi Selettore File</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostra i documenti di questo tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Mostra Documento</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostra documenti in questa categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Premi per selezionare un documento dalla lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, o seleziona &lt;b&gt;Nuovo Documento&lt;/b&gt; per creare un nuovo documento.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Tieni premuto per le proprietà del documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Stringa Non Trovata.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Raggiunta la fine, inizio da capo</translation>
+        <translation type="obsolete">Raggiunta la fine, inizio da capo</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Trova cosa:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Inizia Ricerca da:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dic 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Maiuscole/minuscole</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Trova Indietro</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vista Documento</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Cancellazione file fallita.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copia di </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplica</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Copia file fallita.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Spostamento documento fallito.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commento:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Caricamento veloce (consuma memoria)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Il supporto su cui è salvato il documento.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Il nome di questo documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Carica questa applicazione così da renderla istantaneamente disponibile.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Cancella questo documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Crea una copia di questo documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Trasmetti via IrDA questo documento.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Utilizza rotazione personalizzata</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informazioni Proprietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Inserisci codice</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Impossibile creare il file
 di configurazione per questo
 programma.
 Liberare dello spazio e
 riprovare.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Impossibile creare i file di avvio.
 Liberare dello spazio prima di
 inserire i dati</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>G</translation>
+        <translation type="obsolete">G</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>giorno</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mese</translation>
     </message>
     <message>
         <source>year</source>
         <translation>anno</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Sei sicuro di voler cancellare
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Indirizzo Lavoro:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Indirizzo Abitazione:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Indirizzi Email: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefono Abitazione: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Abitazione: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Cellulare Abitazione: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Abitazione: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pagina Web Lavoro: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefono Lavoro: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Lavoro: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Cellulare Lavoro: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Cercapersone Lavoro: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alias: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Dipartimento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Società</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefono Lavoro</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Lavoro</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Cellulare Lavoro</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Altre Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefono Abitazione</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Abitazione</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Cellulare Abitazione</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Indirizzo Lavoro</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Città Lavoro</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Stato Lavoro</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CAP Lavoro</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Paese Lavoro</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Cercapersone Lavoro</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pagina Web Lavoro</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Professione</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Direttore</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Indirizzo Abitazione</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Città Abitazione</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Stato Abitazione</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>CAP Abitazione</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Paese Abitazione</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Coniuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Figli</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuovo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Premi per chiudere questa finestra, abbandonando le modifiche effettuate.</translation>
+        <translation type="obsolete">Premi per chiudere questa finestra, abbandonando le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Premi per chiudere questa finestra.</translation>
+        <translation type="obsolete">Premi per chiudere questa finestra.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Premi per chiudere questa finestra e salvare le modifiche effettuate.</translation>
+        <translation type="obsolete">Premi per chiudere questa finestra e salvare le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Premi per spostare la finestra.</translation>
+        <translation type="obsolete">Premi per spostare la finestra.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Premi per ingrandire al massimo questa finestra.</translation>
+        <translation type="obsolete">Premi per ingrandire al massimo questa finestra.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;La guida completa non è disponibile per questa applicazione, è comunque presente la guida base.&lt;p&gt;Per usare la guida:&lt;p&gt;&lt;ol&gt;&lt;li&gt;tieni premuto il tasto di aiuto.&lt;li&gt;quando apparirà &lt;b&gt;Cos&apos;è...&lt;/b&gt;, premi un qualunque tasto.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Cos&apos;è...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Vuoi veramente eliminare
  %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Gen</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mag</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Giu</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Lug</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Errore</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">G</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Premi per chiudere questa finestra, abbandonando le modifiche effettuate.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Premi per chiudere questa finestra.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Premi per chiudere questa finestra e salvare le modifiche effettuate.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Premi per ingrandire al massimo questa finestra.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Card CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Card SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Hard Disk SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Card MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>eseguibile citytime non trovato</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Per scegliere il fuso orario,
 prego installare citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 file</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Tutti i %1 file</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tutti i file</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index cb2850d..1ec2aa3 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -1,519 +1,534 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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">Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">Tocca le crocette accuratamente e
+        <translation type="unfinished">Tocca le crocette accuratamente e
 con decisione per tarare il tuo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">Benvenuto in Opie</translation>
+        <translation type="unfinished">Benvenuto in Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documenti</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Mostra Lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Il livello della batteria è critico!
 Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">La batteria si sta scaricando.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La batteria di Back-up si sta scaricando.
 Cambiarla subito.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">biglietto da visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Informazioni</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Stato Batteria</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>FirstUseBackground</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">Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Nessuna applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Ricerca documenti</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Ricerca documenti</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documenti</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Mostra Lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 file</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Tutti i tipi di file</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Mostra Documento</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Supporto inserito</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Un &lt;b&gt;supporto riscrivibile&lt;/b&gt; è stato inserito. Deve essere esaminato?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Quale file</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Tutti</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Link applicazioni</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limita ricerca alla dir: (non ancora usata)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Aggiungi</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">La tua scelta verrà inserita sul supporto.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Non chiedere nuovamente per questo supporto</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Stato Batteria</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>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Informazioni</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">&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Il livello della batteria è critico!
 Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">La batteria di Back-up si sta scaricando.
 Cambiarla subito.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">biglietto da visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Chiudi Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Riavvia</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Riavvia Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Sospendi</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">&lt;p&gt;
 Queste opzioni di chiusura sono state inserite principalmente per sviluppo e test di Opie. Per un uso normale, queste opzioni non sono necessarie.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Cancella</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Sospendi...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Sync Connessione</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se stai utilizzando una versione di Qtopia Desktop più vecchia della 1.5.1, fai l&apos;upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Nega</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">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se hai appena iniziato un Sync per la prima volta, questo è normale.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Permetti</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sincronizzazione</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contatti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancella</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/security.ts b/i18n/it/security.ts
index fa75b9a..c32444c 100644
--- a/i18n/it/security.ts
+++ b/i18n/it/security.ts
@@ -1,264 +1,248 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Imposta password</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambia password</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Password errata</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>La password inserita è sbagliata.
 Accesso negato</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Inserisci nuova password</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Rinserisci nuova password</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Impostazioni Sicurezza</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambia password</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Cancella password</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Richiedi password all&apos;avvio</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accetta sync dalla rete:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (predefinita)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Tutte</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nessuna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;La protezione mediante password fornisce un minimo livello di protezione dall&apos;accesso illegale del dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Password</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Login Automatico</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/it/zsafe.ts b/i18n/it/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/it/zsafe.ts
+++ b/i18n/it/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/addressbook.ts b/i18n/ja/addressbook.ts
index 13a7cdc..ac13c74 100644
--- a/i18n/ja/addressbook.ts
+++ b/i18n/ja/addressbook.ts
@@ -1,1336 +1,1340 @@
 <!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>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close 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>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>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</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>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</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>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</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>Not Found</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>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <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>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</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>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>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</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>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>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</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</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</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</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>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</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>File As</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>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>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</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>Afghanistan</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>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</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>Bolivia</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>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</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>France</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>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</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>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</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>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</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>Norway</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>Palestinian Sovereign Areas</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>Pitcairn Islands</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>Vietnam</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>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</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>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>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/libqpe.ts b/i18n/ja/libqpe.ts
index a84a335..41353fc 100644
--- a/i18n/ja/libqpe.ts
+++ b/i18n/ja/libqpe.ts
@@ -1,939 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</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>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </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>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>Nickname: </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>Groups</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/security.ts b/i18n/ja/security.ts
index d60f914..1530ddb 100644
--- a/i18n/ja/security.ts
+++ b/i18n/ja/security.ts
@@ -1,230 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</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>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/ja/zsafe.ts b/i18n/ja/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/ja/zsafe.ts
+++ b/i18n/ja/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/addressbook.ts b/i18n/ko/addressbook.ts
index 13a7cdc..ac13c74 100644
--- a/i18n/ko/addressbook.ts
+++ b/i18n/ko/addressbook.ts
@@ -1,1336 +1,1340 @@
 <!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>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close 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>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>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</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>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</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>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</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>Not Found</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>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <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>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</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>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>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</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>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>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</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</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</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</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>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</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>File As</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>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>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</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>Afghanistan</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>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</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>Bolivia</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>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</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>France</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>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</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>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</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>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</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>Norway</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>Palestinian Sovereign Areas</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>Pitcairn Islands</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>Vietnam</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>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</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>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>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/libqpe.ts b/i18n/ko/libqpe.ts
index a84a335..41353fc 100644
--- a/i18n/ko/libqpe.ts
+++ b/i18n/ko/libqpe.ts
@@ -1,939 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</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>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </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>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>Nickname: </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>Groups</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/security.ts b/i18n/ko/security.ts
index d60f914..1530ddb 100644
--- a/i18n/ko/security.ts
+++ b/i18n/ko/security.ts
@@ -1,230 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</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>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/ko/zsafe.ts b/i18n/ko/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/ko/zsafe.ts
+++ b/i18n/ko/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/addressbook.ts b/i18n/lv/addressbook.ts
index 13a7cdc..ac13c74 100644
--- a/i18n/lv/addressbook.ts
+++ b/i18n/lv/addressbook.ts
@@ -1,1336 +1,1340 @@
 <!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>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close 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>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>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</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>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</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>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</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>Not Found</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>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <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>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</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>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>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</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>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>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</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</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</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</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>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</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>File As</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>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>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</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>Afghanistan</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>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</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>Bolivia</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>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</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>France</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>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</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>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</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>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</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>Norway</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>Palestinian Sovereign Areas</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>Pitcairn Islands</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>Vietnam</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>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</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>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>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/lv/libqpe.ts b/i18n/lv/libqpe.ts
index a84a335..41353fc 100644
--- a/i18n/lv/libqpe.ts
+++ b/i18n/lv/libqpe.ts
@@ -1,939 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</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>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </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>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>Nickname: </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>Groups</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/lv/qpe.ts b/i18n/lv/qpe.ts
index f0b8d8a..48e9ba1 100644
--- a/i18n/lv/qpe.ts
+++ b/i18n/lv/qpe.ts
@@ -1,334 +1,361 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</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>
 </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>
+    <message>
+        <source>Welcome to Opie</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>FirstUseBackground</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>&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>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</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>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>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>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>
     <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>
 </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>&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>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;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/lv/security.ts b/i18n/lv/security.ts
index d60f914..1530ddb 100644
--- a/i18n/lv/security.ts
+++ b/i18n/lv/security.ts
@@ -1,230 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</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>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/lv/zsafe.ts b/i18n/lv/zsafe.ts
index 0aedd23..543c9d1 100644
--- a/i18n/lv/zsafe.ts
+++ b/i18n/lv/zsafe.ts
@@ -1,601 +1,577 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
+</context>
+<context>
+    <name>CategoryDialog</name>
     <message>
-        <source>ZSafe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D&amp;on&apos;t Delete</source>
+        <source>Icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Entry</source>
+        <source>Field 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Field 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>Field 3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Field 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Comment</source>
+        <source>Field 5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 4</source>
+        <source>Field 6</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>InfoForm</name>
     <message>
-        <source>Field 5</source>
+        <source>Information:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entry name must be different
-from the category name.</source>
+        <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search</source>
+        <source>Field 6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entry not found</source>
+        <source>Field 5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
+        <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 2</source>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 3</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PasswordForm</name>
     <message>
-        <source>All</source>
+        <source>ZSafe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ScQtFileDlg</name>
     <message>
-        <source>Remove text file</source>
+        <source>FileDlg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not remove text file.</source>
+        <source>file type filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No document defined.
-You have to create a new document</source>
+        <source>ComboBox FileTypeFilter
+
+edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export text file</source>
+        <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import text file</source>
+        <source>OKButton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not export to text file.</source>
+        <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not import text file.</source>
+        <source>CancelButton</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter Password</source>
+        <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wrong password.
+        <source>Filename LineEdit
 
-ZSafe will now exit.</source>
+shows the selected file
+and allows the direct filename
+edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wrong password.
-Enter again?</source>
+        <source>ComboBox Directory 
+edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Yes</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;No.</source>
+        <source>size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
+        <source>type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;No</source>
+        <source>directory listview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Yes.</source>
+        <source>Directory ListView
+
+shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password is empty.
-Please enter again.</source>
+        <source></source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ScQtFileEditDlg</name>
     <message>
-        <source>Reenter Password</source>
+        <source>dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
+        <source>file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to save </source>
+        <source>link</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchDialog</name>
     <message>
-        <source>
-before continuing?</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Save</source>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Don&apos;t Save</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password file saved.</source>
+        <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Wait</name>
     <message>
-        <source>Do you want to save
-before exiting?</source>
+        <source>Please Wait...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ZSafe</name>
     <message>
-        <source>S&amp;ave with
-new
-password</source>
+        <source>ZSafe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category</source>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wait dialog</source>
+        <source>Can&apos;t create directory
+%1
+
+ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gathering icons...</source>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
+        <source>&amp;New document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
+        <source>&amp;Open document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open ZSafe document</source>
+        <source>&amp;Save document as ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
+        <source>&amp;Save document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <source>S&amp;ave document with new Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <source>&amp;Export text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
+        <source>&amp;Import text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <source>&amp;Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <source>&amp;Open entries expanded</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CategoryDialog</name>
     <message>
-        <source>Category</source>
+        <source>E&amp;xit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon</source>
+        <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 1</source>
+        <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 2</source>
+        <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 3</source>
+        <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 4</source>
+        <source>&amp;Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 5</source>
+        <source>&amp;Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 6</source>
+        <source>C&amp;opy</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>InfoForm</name>
     <message>
-        <source>Information:</source>
+        <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NewDialog</name>
     <message>
-        <source>New Entry</source>
+        <source>&amp;Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Comment</source>
+        <source>&amp;Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 6</source>
+        <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 5</source>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PasswordForm</name>
     <message>
-        <source>ZSafe</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ScQtFileDlg</name>
     <message>
-        <source>FileDlg</source>
+        <source>Field 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>file type filter</source>
+        <source>Field 3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ComboBox FileTypeFilter
-
-edit or select the filter</source>
+        <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>confirms the selection and closes the form</source>
+        <source>Field 4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OKButton</source>
+        <source>Field 5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>cancels the selection and closes the form</source>
+        <source></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CancelButton</source>
+        <source>Do you want to delete?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>shows the selected filename</source>
+        <source>D&amp;on&apos;t Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filename LineEdit
-
-shows the selected file
-and allows the direct filename
-edit</source>
+        <source>Edit Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ComboBox Directory 
-edit or select the directories name</source>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>size</source>
+        <source>New Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>type</source>
+        <source>Entry name must be different
+from the category name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>directory listview</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Directory ListView
-
-shows the list of dirs and files</source>
+        <source>Entry not found</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ScQtFileEditDlg</name>
     <message>
-        <source>dir</source>
+        <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>file</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>link</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SearchDialog</name>
     <message>
-        <source>Search</source>
+        <source>Remove text file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>Could not remove text file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>No document defined.
+You have to create a new document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Comment</source>
+        <source>Export text file</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Wait</name>
     <message>
-        <source>Please Wait...</source>
+        <source>Import text file</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ZSafe</name>
     <message>
-        <source>ZSafe</source>
+        <source>Could not export to text file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
+        <source>Could not import text file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
+        <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
+        <source>Wrong password.
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;New document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save document as ..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S&amp;ave document with new Password</source>
+        <source>Wrong password.
+Enter again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Export text file</source>
+        <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Import text file</source>
+        <source>&amp;No.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove text file</source>
+        <source>Empty document or
+wrong password.
+Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Open entries expanded</source>
+        <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>E&amp;xit</source>
+        <source>&amp;Yes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;File</source>
+        <source>Password is empty.
+Please enter again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;New</source>
+        <source>Reenter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
+        <source>Passwords must be identical.
+Please enter again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Delete</source>
+        <source>Do you want to save </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Category</source>
+        <source>
+before continuing?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cut</source>
+        <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>C&amp;opy</source>
+        <source>&amp;Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Paste</source>
+        <source>Password file saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Search</source>
+        <source>Do you want to save
+before exiting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Entry</source>
+        <source>S&amp;ave with
+new
+password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
+        <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <source>Wait dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New entry</source>
+        <source>Gathering icons...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit category or entry</source>
+        <source>Create new ZSafe document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete category or entry</source>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find entry</source>
+        <source>Open ZSafe document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Save ZSafe document as..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 2</source>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 3</source>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Comment</source>
+        <source>by Carsten Schneider&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 4</source>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Field 5</source>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/addressbook.ts b/i18n/mk/addressbook.ts
index 1a99ddd..3f6e0df 100644
--- a/i18n/mk/addressbook.ts
+++ b/i18n/mk/addressbook.ts
@@ -1,1514 +1,1518 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Име и Презиме</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Избор</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Контакти</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Преглед</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Листа</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Катичка</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ново</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Започни Пребарување</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Затвори Пребарување</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Напиши е-порака до</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Пренеси запис</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Вметни вКаричка</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Извези вКаричка</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Мои лични детали</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Сними ги сите податоци</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Треба да изберете контакт!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Треба да поставите име на даотека !</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Точен тип на датотека ?</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Избраната датотека
 не завешува со „.vcf“
 Дали сакате да ја отворите?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Не</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Додади контакт?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Дали сакате да додадете контакт за
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Да за сите</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Неможе да се уредуваат податоците, во моментот се синхронизираат</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Уреди Адреса</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Ѕреди ги моите лични детали</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Контакти -  мои лични детали</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Неможе да се сними информацијата.
 Ослободте простор
 и обидете се повторно
 
 Излегување?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Не е пронајдено</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Не можеше да се пронајде контакт за 
 ова пребарување!</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Катички</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Кликнете на јазиче за да изберете едно</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Подесувања за пребарување</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Стил на прашање</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Подесувања за стилот на прашањето на пребарување</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Користи регуларни изрази</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Алатката за пребарување очекува регуларен израз доколку се избере</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Користи специјални знаци (*,?)</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Алатката за пребарување очекува само едноставни специјални знаци</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Внимавај на Големи и Мали букви</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Доколку е изврано, пребарувањето ги разликува големите и малите букви</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Мал</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Големина на фонт за листа - преглед на картички</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормален</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Голем</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Алатки-/Мени палета</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Фиксиран</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Префрли се на фиксирано мени-/палети по рестартирање на апликацијата !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Поместиливи</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Префрли се на поместливо мени-/палети по рестартирање на апликацијата !</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Електронска Пошта</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Подесувања на фонт за листа и преглед на картички</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Преферирам QT-Mail</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Користи ја апликацијата за електронска пошта на Sharp доколку е достапна</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Преферирам Opie-Mail</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Користи OPIE апликација за електронска пошта ако е инсталирана</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Забелешка: QT-Mail е 
 достапен само на  
 SHARP основниот ROM.
 Оpie-Mail е слободен !</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Подреди</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Избери редослед на контакти:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Нагоре</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Помести го избраниот атрибут еден ред погоре</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Надоле</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Помести го избраниот атрибут еден ред подоле</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Листа на сите достапни атрибути</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Додај го избраниот атрибут од долната на горната листа</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Отстрани</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Отстрани го избраниот атрибут од горната листа</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Подреди (горе -&gt; доле) го дефинира примарниот контакт прикажан во втората колона на прегледот по листа </translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Полно име...</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Притиснете enter за да внесете презиме, средно име и име</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>Внесете го целото име директно! Доколку имате презиме со повеќе зборови (на пр, Јакимовска Јосифовиќ), напишете &lt;презиме&gt;,&lt;име&gt; пр: Јакимовска Јосифовиќ, Слободанка</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Работно Место</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Работно Место..</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суфикс</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Нешто како „јр.“..</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Организација</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Работно место на контактот</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Притисно ма атрибутот кој сакате да го измените</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Зачувај како</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Притиснете да изберете како да го зачувате името (и како да го прикажете во прегледот на листата)</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категорија</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Забелешки...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Бизнис</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Град</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Република</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Поштенски код</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Држава</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Соединети Држави</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Велика Британија</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Авганистан</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Албанија</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Алгерија</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Америчка Самоа</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Андора</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Ангола</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Ангулија</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Антартик</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Аргентина</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Ерменија</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Аруба</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Аустралија</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Австриа</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Азејберџан</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Бахами</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Бахиран</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Бангладеш</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Барбадос</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Беларус</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Белгија</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Белз</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Бенин</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Бермуди</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Бхутан</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Боливија</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Боцвана</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Боветски острови</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Бразил</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Бурнеи</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Бугарија</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Буркина</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Бурунди</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Камбоџа</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Камерун</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Канада</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Кејп Верде</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Кајмански острови</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Чад</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Чиле</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Кина</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Божиќни острови</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Колумбија</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Коморос</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Конго</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Кук Остров</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Коста Рика</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Коте</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Хрватска</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Куба</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Кипар</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Чешка</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Данска</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Џибути</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Доминиканска република</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Доминиканска република</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Источен Тиомор</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Еквадор</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Египед</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>Ел Салвадор</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Екваторијална Гвинеја</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Еритреа</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Естонија</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Етиопија</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Фалкландски острови</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Фараонски Острови</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Фиџи</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Финска</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Франција</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Француска гвинеа</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Француска Полинезија</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Габон</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Гамбија</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Џорџија</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Германија</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Гахана</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Гибралтар</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Грција</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Гринланд</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Гренада</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Гвадалупе</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Гуам</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Гватемала</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Гвинеа</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Гвинеа-Бису</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Гуана</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Хаити</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Свето Море</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Хондарус</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Хон Конг</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Унгарија</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Исланд</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Индиа</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Индонесија</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Ирска</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Израел</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Италија</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Јамајка</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Јапонија</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Јордан</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Казахстан</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Кенија</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Кирибати</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Кореа</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Кувајт</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Кургзастан</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Лаос</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Латвија</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Лебанон</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Лесто</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Либериа</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Лхтенштајн</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Литванија</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Луксембург</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Макау</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Македонија</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Мадагаскар</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Малави</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Малезија</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Малдиви</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Мали</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Малта</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Мариникве</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Мауритана</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Маурициус</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Мајот</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Мексико</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Микронезија</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Молдова</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Монако</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Монголија</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Мнтесерат</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Мароко</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Мозамби</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Мајамар</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Намбија</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Нару</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Непал</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Холандија</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Нова Каледонија</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Нов Зеланд</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Никарагва</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Нигерија</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Нигерија</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Ниуе</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Норвешка</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Оман</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Пакистан</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Палау</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Палестина</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Панама</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Папа Нова Гвинеја</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Парагвај</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Перу</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Филипини</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Острови Питчарин</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Полска</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Португалија</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Пуерто Рико</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Кватар</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Рејунион</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Романија</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Русија</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Рованда</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Сент Луција</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Самоа</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>Сан Марино</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Саудиска Арабија</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Сенегал</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Сејчелс</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Сиера Леоне</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Сингапур</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Словачка</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Словениа</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Соломонски Острови</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Сомалија</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Јужна Африка</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Шпанија</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Шри Ланка</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Св. Хелена</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Судан</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Суринам</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Свазиланд</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Шведска</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Швајцарија</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Тајван</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Таџекистан</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Танзанија</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Тајланд</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Того</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Токелау</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Тонга</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Тунезија</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Турција</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Туркменистан</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Тувалу</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Уганда</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Украина</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Уругвај</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Узбекистан</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Вануту</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Венецуела</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Виетнам</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Девствени Острови</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Западна Сахара</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Јемен</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Југославија</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Замбија</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Зимбабве</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Роденден</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годишнина</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женски</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детаљи</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Внеси Забелешка</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Уреди Име</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>средно име</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Презиме</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Контакти</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Име/Наслов</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">средно име</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Презиме</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Суфикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Сними како</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Работно Место</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Одделение/Сектор</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Компанија</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Тел. на работа</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Факс на работа</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Службен мобилен</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Адреса за електронска пошта (основна)</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Останати адреси за електронска пошта</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Домашен телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Домашен факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Приватен Мобилен</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Улица на фирмата</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Град на фирмата</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Република на Фирмата</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Поштенски код на Фирмата</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Службен Пејџер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Интернет страница на фирмата</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Канцеларија</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Професија</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Асистент</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Раководител/менаџер</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Улица</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Град</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Република</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Поштенски код</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Држава</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Интернет страница</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Сопруг/Сопруга</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Роденден</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Годишнина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Надимак</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Деца</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Забелешки</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libqpe.ts b/i18n/mk/libqpe.ts
index cc2252c..4ca9aa6 100644
--- a/i18n/mk/libqpe.ts
+++ b/i18n/mk/libqpe.ts
@@ -1,960 +1,1030 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(повеќе)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Бизнис</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Лични</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Повеќе)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Нова категорија</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Нова категорија</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Уреди Категорија</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Апликација</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Овде идат категориите</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Види во кои категории спаѓа документов.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Внеси нова категорија. Притисни &lt;b&gt;Додај&lt;/b&gt; за да се додаде на листата.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Внеси нова категорија лево и притисни додај за да се додаде на листата.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Притисни за да сеизбрише избраната категорија.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Глобална</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Избери за ова својство да биде достапно на сите апликации.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Друга апликација ги 
 уредува категориите.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Уреди категории</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Прикажи го Јануари во избраната година</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Прикажи го претходниот месец</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Прикажи го следниот месец</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Прикаѓи го Декември во избраната година</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Затвори го избирачот на датотеки</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Прикажи ги документите од овој тип</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Преглед на документи</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Прикажи ги документите во оваа категорија</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Кликни за да избереш документ од листата</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, или избери &lt;b&gt;Нов Документ&lt;/b&gt; за да се креира нов документ.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Кликни и држи за својства на докуументот.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Име</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Стригот не е пронајден.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Стигнав до крајк, повторно почнувам од почеток</translation>
+        <translation type="obsolete">Стигнав до крајк, повторно почнувам од почеток</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Барај:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категрија:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Почни со пребарување на:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Дек 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Внимавај на големина на карактери</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Барај наназад</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Својства</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Преглед на документи</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Бришењето на датотеката неуспеа.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Тврд Диск</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Копија на</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Дупликат</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Неуспешно копирање.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Поместувањето на документот неуспеа.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Користи сопствена ротација</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Однапред вчитај ја апликацијава, за да биде веднаш достапна.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Името на овој документ.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Медимуот на кој е сместен документот.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Брззо вчитување (одзема меморија)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Коментар:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Избриши го документов.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копирај</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Направи копија на документов.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Пренеси</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Пренеси го документов на друг уред.</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Информации за сопственикот</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Внеси лозинка</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Нов Документ</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Кликни за да го затвориш овој прозорец, занемарувајќи ги промените.</translation>
+        <translation type="obsolete">Кликни за да го затвориш овој прозорец, занемарувајќи ги промените.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Кликни за да го затвориш овој прозорец.</translation>
+        <translation type="obsolete">Кликни за да го затвориш овој прозорец.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Кликни за да го затвориш овој прозорец, памтејќи ги промените.</translation>
+        <translation type="obsolete">Кликни за да го затвориш овој прозорец, памтејќи ги промените.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Кликни за да можеш да го поместуваш прозорецов.</translation>
+        <translation type="obsolete">Кликни за да можеш да го поместуваш прозорецов.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Кликни за проорецот да ја покрие целата површина на екранот.</translation>
+        <translation type="obsolete">Кликни за проорецот да ја покрие целата површина на екранот.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Ot&gt;Нема детална  помош за оваа апликација&lt;p&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Што е ова...</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Имаше проблем при креирањето на 
 конфигурациските информации
 за овој програм.
 
 Ослободете простор и
 обидете се повторно.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Неможе да се креираат стартните датотеки
 Ослободете простор 
 пред да внесувате податоци</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Неможе да се намести алармот.
 Ослободете меморија и обидете се повторно.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>Д</translation>
+        <translation type="obsolete">Д</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>М</translation>
+        <translation type="obsolete">М</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>Г</translation>
     </message>
     <message>
         <source>day</source>
         <translation>ден</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месец</translation>
     </message>
     <message>
         <source>year</source>
         <translation>година</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>ПМ</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>АМ</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втор</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Сред</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Дали сакате да го избришете 
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>E-mail адреса:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Домашен Телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Домашен Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Приватен Мовилен:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Приватна интернет страна:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Службена интернет страна:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Канцеларија:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Службен телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Службен факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Службен мобилен:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Службен Пејџер:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Професија:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Асистент:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Раководител:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Маж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жена</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Споруг/Сопруга:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Роденден:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годишнина:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Надимак:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Титула</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Средно Име</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Презиме</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суфикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Сними како</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Работно место</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Одделение</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Фирма</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Службен телефон</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Службен факс</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Службен мобилен</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Основна E-mail адреса</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Е-mail адреси</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Домашен Телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Домашен Факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Приватен Мовилен</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Улица на фирмата</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Град на фирмата</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Поштенски код на фирмата</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Службен пејџер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Службена интернет страна</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Професија</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Асистент</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Раководител</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Домашна улица</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Домашен град</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Домашна држава</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Домашен поштенски број</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Домажна држава</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Приватна интернет страна</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Споруг/Сопруга</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Роденден</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годишнина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Надимак</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Деца</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Забелешки</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Групи</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Грешка</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">Д</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">М</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 документ</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Кликни за да го затвориш овој прозорец, занемарувајќи ги промените.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Кликни за да го затвориш овој прозорец.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Кликни за да го затвориш овој прозорец, памтејќи ги промените.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Кликни за проорецот да ја покрие целата површина на екранот.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF картичка</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Тврд диск</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD картичка</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC картичка</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI тврд диск</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Внатрешна меморија</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Внатрешен медиум</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Извршната датотека „време на град“ не е пронајдена</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>За да ги одберете временските зони,
 инсталирајте го „време на град“.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Неможе да се намести алармот.
 Ослободете меморија и обидете се повторно</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 датотеки</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Сите %1 датотеки</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Сите датотеки</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index 96acd4f..185fa5c 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -1,516 +1,531 @@
 <!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">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">Кликни на крстовите цврсто и 
+        <translation type="unfinished">Кликни на крстовите цврсто и 
 прецизно за да го калибрираш екранот.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">Добредојде во Opie</translation>
+        <translation type="unfinished">Добредојде во Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Документи</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Преглед по листа</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Нивото на батеријата е критично!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Нивото на батеријата е многу ниско.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Помошната батерија е многу слаба.
 Наполни ја помошната батерија.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">Визиткарта</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Информации</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</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>FirstUseBackground</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>Finding documents</source>
         <translation type="obsolete">Барање документи</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Пребарување на документи</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">&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
     </message>
     <message>
         <source>Documents</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>Icon View</source>
         <translation type="unfinished">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Преглед по листа</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 датотеки</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Аите типови на датотека</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Преглед на документи</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Внесен медиум</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Аудио</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Слика</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Видео</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Сите</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Поврзи апликации</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Додај</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Твојата одлука ќе биде снимена на медиумот.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Не го барај овој медиум пак</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Состојба на батерија</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>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">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Нивото на батеријата е критично!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Помошната батерија е многу слаба.
 Наполни ја помошната батерија.</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">Исклучи Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Рестартирај</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Рестартирај Opie</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">&lt;p&gt;
 Овие иоции за гасење се наменети за користење за време на развој и тестирање на Опие системот. Во нормална околина, овие концепти се непотребни.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Откажи</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Врска за синхронизирање</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</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">&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</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>Syncing</source>
         <translation type="obsolete">Синхронизирање</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Контакти&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Откажи</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/security.ts b/i18n/mk/security.ts
index 8c32bcc..eea194d 100644
--- a/i18n/mk/security.ts
+++ b/i18n/mk/security.ts
@@ -1,263 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Намести лозинја</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Смени лозинка</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Неточна лозинка</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Лозинката не е точна.
 Одбиен пристап</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Внеси нова лозинка</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Повтторно внеси лозинка</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Сигурносни подесувања</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Смени лозинка</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Избриши лозинка</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Барај лозинка на подигање</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Синхронизирај</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Прифати синхронизација од мрежа:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (основна)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Ништо</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;p&gt; Заштитата со лозинка дава минимални ниво на заштита од повремен пристап до уредот.</translation>
     </message>
     <message>
         <source>Passcode</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>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/mk/zsafe.ts b/i18n/mk/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/mk/zsafe.ts
+++ b/i18n/mk/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/addressbook.ts b/i18n/nl/addressbook.ts
index 5c3f77d..9b831db 100644
--- a/i18n/nl/addressbook.ts
+++ b/i18n/nl/addressbook.ts
@@ -1,1519 +1,1523 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Volledige naam</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Kies</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Schrijf mail aan</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Stuur via IR</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mijn persoonlijke gegevens</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Bekijk</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan niet wijzigen tijdens synchronisatie</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Wijzig persoonlijke gegevens</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Wijzig adres</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacten - Mijn persoonlijke gegevens</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Geen ruimte</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Kan niet opslaan.
 Maak ruimte en probeer het opnieuw.
 
 Toch stoppen?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongeklassificeerd</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importeer vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Sluit Vind</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Sla alles op</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configureer</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Niet gevonden</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lijst</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Kaartjes</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Kaart</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Start zoeken</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Juist bestandstype?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="obsolete">Kan niets vinden dat voldoet
  aan de zoekterm!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Het geselecteerde bestand 
  eindigt niet op &quot;.vcf&quot;.
  Wilt u het alsnog openen?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Contact toevoegen?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wilt U inderdaad een contact
 toevoegen voor %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp; Ja op alles</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exporteer vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>U moet een contact selecteren!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>U moet een bestandsnaam selecteren!</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Kan geen kontakt vinden met dit zoekpatroon!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Verzoekstijl</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Gebruik reguliere expressies</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Gebruik jokertekens (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Gebruik QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Gebruik Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Opmerking: QT-Mail is
 alleen voorhanden in de
 SHARP standaard ROM.
 Opie-Mail wordt gratis
 geleverd!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Zoekopties</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Volgorde</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Kies contactvolgorde:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Omhoog</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Omlaag</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klik op tab om te selecteren</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Opties voor de zoekstijl</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Zoekelement verwacht reguliere expressies als die zijn geselecteerd</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Zoekelement verwacht alleen jokertekens</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Indien geselecteerd, hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Fontgrootte voor lijst- en kaartweergave</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Fontsettings voor lijst- en kaartweergave</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Gebruik Sharp&apos;s mailprogramma indien beschikbaar</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Gebruik Opie mail indien geinstalleerd</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Verplaats geselecteerd kenmerk een plaats omhoog</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Verplaats geselecteerd kenmerk een plaats omlaag</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lijst van alle mogelijke kenmerken</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Voeg geselecteerd kenmerk toe van onderstaande lijst aan de bovenste lijst </translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Verwijder geselecteerd kenmerk uit de bovenste lijst</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Volgorde (op -&gt; neer) regelt wat het eerst wordt weergegeven in de tweede kolom in de lijstweergave</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Gereedschap-/Menubalk</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Vast</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Schakel over naar vaste gereedschap-/menubalk na het wisselen van programma!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Verplaatsbaar</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Schakel over naar verplaatsbare gereedschap-/menubalk na het wisselen van programma!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Toevoeging</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Sla op als</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geslacht</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functie</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Woonplaats</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincie</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Volledige naam...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisatie</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notities</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Privé</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postcode</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Verenigde Staten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Verenigd Koninkrijk</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankrijk</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Duitsland</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noorwegen</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Maak notitie</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Wijzig naam</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanië</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algerije</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikaans Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentinië</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australië</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Oostenrijk</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbeidzjan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahama&apos;s</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrein</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>België</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda&apos;s</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Eiland</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brazilië</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarije</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Kaapverdische Eilanden</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Kaaiman Eilanden</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chaad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chili</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Paaseiland</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoren</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Eiland</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Ivoorkust</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Kroatië</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Cyprus</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Tsjechische Republiek</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Denemarken</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominicaanse Republiek</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Oost Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egypte</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Equatoriaal Guinee</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estland</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Ethiopië</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falkland Eilanden</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Faroe Eilanden</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finland</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Frans Guyana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Frans Polynesië</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Greorgië</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Griekenland</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinee</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haïti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hongarije</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>IJsland</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesië</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Ierland</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israël</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italië</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanië</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazachstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litouwen</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonië</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Maleisië</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malediven</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauretanië</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronesië</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldavië</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolië</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marokko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibië</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Nederland</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nieuw Caledonië</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nieuw Zeeland</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigerië</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nieuw Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Fillipijnen</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Quatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Roemenië</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi Arabië</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellen</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapore</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slowakijë</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenië</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon Eilanden</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalië</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Zuid-Afrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanje</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Zweden</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Zwitserland</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesië</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turkije</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Oekraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Oezbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Maagdeneilanden</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Westelijke Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Joegoslavië</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jaardag</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Koeweit</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antartica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenië</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kameroen</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinee-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kirgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestijnse autonome gebieden</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Eilanden</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Druk hier om volledige naam in te vullen</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>Vul de hele naam direct in! Als een achternaam met meerdere woorden moet worden ingevuld (bijvoorbeeld &quot;de Vries&quot;), schrijf dan &lt;achternaam&gt;, &lt;voornamen&gt; zoals dit: &quot;de Vries, Peter Paul&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>De functienaam..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Iets als &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>De plaats waar het contact werkt</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Druk om het te veranderen kenmerk te selecteren</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Druk hier om te selecteren hoe de naam opgeslagen(en weergegeven in de lijst) moet worden</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Telefoon werk</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax werk</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Mobiel werk</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Standaard email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Telefoon prive</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax prive</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Mobiel prive</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Kantoor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Beroep</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Echtgeno(o)t(e)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Geslacht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Jaardag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Bijnaam</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Kinderen</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Achtervoegsel</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Sla op als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Functie</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Bedrijf</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Bedrijf adres</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Bedrijf woonplaats</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Bedrijf provincie</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Bedrijf Postcode</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Bedrijf land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Bedijf pieper</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Bedrijf website</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Prive adres</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Prive woonplaats</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Prive provincie</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Prive postcode</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Prive land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Prive website</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notities</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libqpe.ts b/i18n/nl/libqpe.ts
index 76a1340..8443b6a 100644
--- a/i18n/nl/libqpe.ts
+++ b/i18n/nl/libqpe.ts
@@ -1,999 +1,1050 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Persoonlijk</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nieuwe Categorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nieuwe Categorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Wijzig Categorie</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorieen</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Programma&apos;s</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorieen komen hier</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Controleer de categorieen waar dit document toe behoort.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Voer hier een nieuwe categorie in. Druk op &lt;b&gt;Voeg toe&lt;/b&gt; om hem aan de lijst toe te voegen.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg Toe</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Maak links een nieuwe categorie, en druk op deze om hem aan de lijst toe te voegen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Druk in om de gekozen categorie te verwijderen.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Vink aan om dit attribuut beschikbaar te maken voor alle programma&apos;s.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Sorry, een ander programma
 vwijzigt al categorieen.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Wijzig Categorieen</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Laat januari in het geselecteerde jaar zien</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Laat de afgelopen maand zien</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Laat de volgende maand zien</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Laat december in het geselecteerde jaar zien</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Sluit de destandskiezer</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Laat bestanden van dit type zien</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Documentaanzicht</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Laat bestanden van deze categorie zien</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klik om een bestand uit de lijst te selecteren</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, of selecteer &lt;b&gt;Nieuw Document&lt;b/&gt; om een nieuw document te maken.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Houd ingedrukt om documenteigenschappen te zien.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Tekenreeks niet gevonden.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Einde bereikt, begin bovenaan</translation>
+        <translation type="obsolete">Einde bereikt, begin bovenaan</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Vind wat:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categorie:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Start zoeken op:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Zoek achteruit</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Eigenschappen</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Documentaanzicht</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Verwijderen van bestand mislukt.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harde schijf</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopie van</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikaat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Bestandskopie mislukt.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Verschuiven van bestand mislukt.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Gebruik eigen rotatie</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Laad dit bestand alvast in zodat het direct beschkbaar is.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>De naam van dit document.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>De media waarop dit bestand zich bevindt.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Snelladen (gebruikt geheugen)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commentaar:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Verwijder dit document.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieer</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Maak een kopie van dit document.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Verstuur via IR</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Verstuur dit bestand via IR naar een ander apparaat.</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informatie over de Eigenaar</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Voer wachtwoord in</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Nieuw Document</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Geen plaats</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Er is een probleem bij het maken
 van Configuratieinformatie voor
 dit programma.
 
 Maak ruimte vrij, en probeer
 nogmaals.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Kan geen startbestanden maken.
 Maak aub plaats voordat u
 data gaat invoeren</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Kan alarm niet instellen.
 Maak ruimte vrij, en probeer het
 nogmaals.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>J</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Weet u zeker dat u %1
 wilt verwijderen?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Werkadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Thuisadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>eMailadres:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefoon Prive:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Prive:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobiel Prive:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Webpagina Prive:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Webpagina Werk:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kantoor:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefoon Werk:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Werk:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobiel Werk:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pieper Werk:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beroep:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geslacht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Echtgeno(o)t(e):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Verjaardag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jaardag:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Naam Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Achtervoegsel</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Sla op als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functietitel</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Bedrijf</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefoon Werk</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Werk</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobiel Werk</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>algemene eMailadres</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Eamiladressen</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefoon Prive</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Prive</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobiel Prive</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Werk Straat</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Werk Plaats</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Werk Provincie</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Werk Postcode</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Werk Land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pieper Werk</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Webpagina Werk</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beroep</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Prive Straat</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Prive Plaats</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Prive Provincie</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Prive Postcode</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Prive Land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Prive Webpagina</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Echtgeno(o)t(e)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geslacht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jaardag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Bijnaam</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinderen</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Groepen</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Klik om dit venster te sluiten zonder op te slaan.</translation>
+        <translation type="obsolete">Klik om dit venster te sluiten zonder op te slaan.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Klik om dit venster te sluiten.</translation>
+        <translation type="obsolete">Klik om dit venster te sluiten.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
+        <translation type="obsolete">Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Klik om dit venster beweegbaar te maken.</translation>
+        <translation type="obsolete">Klik om dit venster beweegbaar te maken.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Klik om te maximaliseren.</translation>
+        <translation type="obsolete">Klik om te maximaliseren.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Uitgebreide help voor dit pakket is niet beschikbaar, maar er is wel contextgevoelige hulp.&lt;p&gt;Om de contextgevoelige help te gebruiken:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Druk de help knop enige tijd in.&lt;li&gt;Als op de titelbalk &lt;b&gt;Wat is dit...&lt;/b&gt; staat, druk dan op een functie.&lt;/ol&gt;&lt;/Qt&gt; </translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Wat is dit...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Weet U zeker dat u dit bestand wilt verwijderen
 %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Fout</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="obsolete">&lt;Qt&gt;Uitgebreide help voor dit pakket is niet beschikbaar, maar er is wel contextgevoelige hulp.&lt;p&gt;Om de contextgevoelige help te gebruiken:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Druk de help knop enige tijd in.&lt;li&gt;Als op de titelbalk &lt;b&gt;Wat is dit...&lt;/b&gt; staat, druk dan op een functie.&lt;/ol&gt;&lt;/Qt&gt; </translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="obsolete">Wat is dit...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Klik om dit venster te sluiten zoner op te slaan.</translation>
+        <translation type="unfinished">Klik om dit venster te sluiten zoner op te slaan.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation type="obsolete">Klik om dit venster te sluiten.</translation>
+        <translation type="unfinished">Klik om dit venster te sluiten.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
+        <translation type="unfinished">Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="obsolete">Klik om dit venster beweegbaar te maken.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Klik om te maximaliseren.</translation>
+        <translation type="unfinished">Klik om te maximaliseren.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kaart</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kaart</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC Kaart</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Harddisk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Intern geheugen</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Interne opslag</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Tijdzoneprogramma niet gevonden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Om de tijdzones te kunnen kiezen
 moet u het programma citytime
 installeren.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Geen plaats</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Kan alarm niet instellen.
 Maak ruimte vrij, en probeer het nogmaals</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 files</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %1
 
 ninor mimetype / major mimetype</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1 bestanden</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/qpe.ts b/i18n/nl/qpe.ts
index 120db8a..fc6177b 100644
--- a/i18n/nl/qpe.ts
+++ b/i18n/nl/qpe.ts
@@ -1,518 +1,533 @@
 <!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">Programma probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">Programma probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">Raak de richtkruizen duidelijk en
+        <translation type="unfinished">Raak de richtkruizen duidelijk en
 precies aan om het scherm in te stellen.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">Welkom bij Opie</translation>
+        <translation type="unfinished">Welkom bij Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">Documenten</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">Icoonaanzicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">Lijstaanzicht</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Batterijlading is kritiek!
 Laat uitgeschakeld tot kan worden opgeladen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">Batterijlading is erg laag.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">De reservebatterijlading is erg laag.
 Reservebatterij opladen aub.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">visitekaartje</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">Informatie</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;De systeemdatum lijkt niet correct.
 (%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Batterijstatus</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>FirstUseBackground</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">Launcher</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Vinden documenten</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Zoeken documenten</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Geen programma</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">Er is geen programma ingesteld voor dit document.&lt;p&gt;Type is %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documenten</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Icoonaanzicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Lijstaanzicht</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 bestanden</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Alle types van bestand</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Documentaanzicht</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Ingeschakeld medium</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Een &lt;b&gt;opslagmedium&lt;/b&gt; is ingeschakeld. Moet dit onderzocht worden op mediabestanden?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">Koppel programma&apos;s</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Beperk zoeken tot map: (nog niet gebruikt)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">Voeg toe</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">Uw beslissing word opgeslagen op het medium.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Vraag niet nogmaals voor dit medium</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Batterijstatus</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>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Informatie</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">&lt;p&gt;De systeemdatum lijkt niet correct.
 (%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Batterijlading is kritiek!
 Laat uitgeschakeld tot kan worden opgeladen!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">De reservebatterijlading is erg laag.
 Reservebatterij opladen aub.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">visitekaartje</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">Afsluiten...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Beeindigen</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Opie beeindigen</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Herstarten</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Opie herstarten</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Afsluiten</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">&lt;p&gt;
 Deze afsluitopties worden voornamelijk voor gebruik tijdens ontwikkeling en tests van het Opie systeem. In een normale omgeving zijn deze opties niet nodig.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Synchronisatieverbinding</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">Een niet geautoriseerd systeem probeert toegang te krijgen tot dit apparaat.&lt;p&gt;Aub upgraden als u een versie van Qtopia desktop ouder dan 1.5.1 gebruikt.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Weiger</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">&lt;p&gt;Een onbekend systeem probeert toegang te krijgen tot dit apparaat. Dit is normaal als dit de eerste keer is dat u synchroniseert.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Sta toe</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Synchroniseren</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Kontakten&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Annuleren</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/security.ts b/i18n/nl/security.ts
index 7dbe095..fa209b6 100644
--- a/i18n/nl/security.ts
+++ b/i18n/nl/security.ts
@@ -1,263 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Stel PINcode in</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Verander PINcode</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Voer PINcode in</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>PINcode niet correct</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Ingevoerde PINcode is niet correct.
 Toegang geweigerd</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Voer nieuwe PINcode in</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Voer nieuwe opnieuw PINcode in</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Beveiligingsinstellingen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Verander PINcode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Schoon PINcode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Vraag PINcode bij power-aan</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accepteer sync van netwerk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (standaard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Geen</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;p&gt;PINcode beveiliging biedt slechts een minimale beveiliging tegen toevallige toegang tot dit apparaat.</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>PINcode</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Log in</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Log automatich in</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/nl/zsafe.ts b/i18n/nl/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/nl/zsafe.ts
+++ b/i18n/nl/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/addressbook.ts b/i18n/no/addressbook.ts
index 20e9401..1a43b9d 100644
--- a/i18n/no/addressbook.ts
+++ b/i18n/no/addressbook.ts
@@ -1,1336 +1,1340 @@
 <!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>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close 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>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>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</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>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</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>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</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>Not Found</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>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <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>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</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>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>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</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>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>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</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</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</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>Moveable</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</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>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</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>File As</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>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>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</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>Afghanistan</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>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</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>Bolivia</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>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</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>France</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>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</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>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</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>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</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>Norway</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>Palestinian Sovereign Areas</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>Pitcairn Islands</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>Vietnam</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>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</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>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>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index 935ab0b..39f81e6 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -1,939 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </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>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>Nickname: </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>Groups</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>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/qpe.ts b/i18n/no/qpe.ts
index 7bc5e05..c2aa1c4 100644
--- a/i18n/no/qpe.ts
+++ b/i18n/no/qpe.ts
@@ -1,334 +1,361 @@
 <!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>
+    <message>
+        <source>Welcome to Opie</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>FirstUseBackground</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>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>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/no/security.ts b/i18n/no/security.ts
index 8b69c6f..9dbe05b 100644
--- a/i18n/no/security.ts
+++ b/i18n/no/security.ts
@@ -1,230 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</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>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</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>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode</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>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/no/zsafe.ts b/i18n/no/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/no/zsafe.ts
+++ b/i18n/no/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 0af81de..55f417d 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -1,1514 +1,1518 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Pełna nazwa</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Wybór</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Znajdź</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Napisz e-mail do</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Emituj wpis</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Moje dane osobiste</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nie można zmieniać danych podczas synchronizacji</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Edycja moich danych osobistych</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Edycja adresu</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakty - moje dane osobiste</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca w pamięci</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nie można zapisać informacji.
 Zwolnij miejsce w pamięci
 i spróbuj ponownie
 
 Zakończyć?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielone</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importuj wizytówkę (vCard)</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zamknij eyszukiwarkę</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Zapisz wszystkie dane</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nie znaleziono</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Wizytówki</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Wizytówka</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Właściwy typ pliku?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Tak</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nie</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Nie znaleziono wizytówki odpowiadającej
 warunkom wyszukiwania!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Wybrany plik
 nie ma rozszerzenia &quot;.vcf&quot;.
 Czy na pewno chcesz go otworzyć?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Dodać wizytówkę?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Czy na pewno chcesz dodać wizytówkę
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Tak na &amp;wszystkie</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Eksportuj wizytówkę (vCard)</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Musisz wybrać wizytówkę!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Musisz podać nazwę pliku!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Styl zapytania</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Używaj wyrażeń regularnych</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Używaj znaków specjalnych (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Wielkość liter znacząca</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Poczta</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Preferuj QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Preferuj Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Uwaga: QT-mail jest załączony
 jedynie w oryginalnym ROM&apos;ie
 SHARP&apos;a. Opie-Mail jest
 dostępny za darmo!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Ustawienia wyszukiwania</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Mała</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Duża</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Kolejność</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Wybierz kolejność wizytówek:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Góra</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dół</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Konfiguracja</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Kliknij w zakładkę aby ją wybrać</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Ustawienia stylu zapytania</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Obiekt wyszukiwarki będzie oczekiwał wyrażeń regularnych</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Obiekt wyszukiwarki oczekuje tylko prostych znaków specjalnych</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Wyszukiwarka będzie rozróżniała wielkość znaków</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Wielkość czcionki dla listy i wizytówki</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Ustawienia czcionki dla listy i wizytówki</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Używaj aplikacji pocztowej Sharp&apos;a, jeśli jest dostępna</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Używaj aplikacji pocztowej OPIE, jeśli jest zainstalowana</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Przesuń wybrany atrybut o jedną pozycję do góry</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Przesuń wybrany atrybut o jedną pozycję do dołu</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista wszystkich dostępnych atrybutów</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Dodaj wybrany atrybut z dolnej listy do górnej listy</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Usuń wybrany atrybut z górnej listy</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Kolejność (góra -&gt; dół) definiuje główny kontakt wyświetlany w drugiej kolumnie na liście wizytówek</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Narzędzia/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Stałe</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Zmień Narzędzia/Menu na Stałe po ponownym uruchomieniu programu!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Ruchome</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Zmień Narzędzia/Menu na Ruchome po ponownym uruchomieniu programu!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Imię</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imię</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Tytuł</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Pokazuj jako</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Płeć</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Stanowisko</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Region</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Kraj</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Pełna nazwa...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notatki...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Podstawowe</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Kod pocztowy</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Stany Zjednoczone</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Anglia</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algieria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Amerykańska</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andora</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentyna</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbejdzan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahama</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesz</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Białoruś</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgia</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudy</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Wyspa Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brazylia</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bułgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodża</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Kajmany</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Czad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Chiny</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Wyspa Bożego Narodzenia</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Kolumbia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Komory</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Kongo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Wyspy Cooka</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Kostaryka</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Wybrzeże Kości Słoniowej</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Chorwacja</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Kuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Cypr</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Czechy</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dania</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Dżibuti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominika</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikana</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Wschodni</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ekwador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipt</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>Salwador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Gwinea Równikowa</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Erytrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falklandy</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Wyspy Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fidżi</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlandia</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francja</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Gujana Francuska</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinezja Francuska</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Niemcy</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecja</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Gwatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Gwinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Gujana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Watykan</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Węgry</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islandia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indie</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonezja</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlandia</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Izrael</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Włochy</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japonia</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordan</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazachstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Łotwa</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Liban</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litwa</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luksemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Makao</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malezja</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malediwy</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martynika</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Maurytania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Meksyk</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronezja</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Mołdawia</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monako</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Maroko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambik</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Holandia</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nowa Kaledonia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nowa Zelandia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nikaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norwegia</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nowa Gwinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paragwaj</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipiny</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polska</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugalia</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Katar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumunia</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rosja</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Saint Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arabia Saudyjska</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seszele</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Słowacja</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Słowenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Wyspy Salomona</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Afryka Południowa</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Hiszpania</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Św. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Surinam</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Suazi</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Szwecja</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Szwajcaria</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Tajwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadżykistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tajlandia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunezja</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turcja</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraina</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Urugwaj</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Wenezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Wyspy Dziewicze</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Zachodnia Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugosławia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Wprowadź notatkę</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Edytuj notatkę</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwejt</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afganistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antarktyka</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Boliwia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kamerun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Gwadelupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Gwinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamajka</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kirgistan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Autonomia Palestyńska</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Wietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Wciśnij by wprowadzić imiona i nazwisko</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>Wpisz swoje dane dokładnie! Jeśli masz wieloczłonowe nazwisko (np. &quot;Van Helsing&quot;), wprowadź &lt;nazwisko&gt;,&lt;imiona&gt; w ten sposob: &quot;Van Helsing, Abraham&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Stanowisko..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Na przykład &quot;jr&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Miejsce pracy z wizytówki</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Wciśnij by wybrać atrybut do zmiany</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Wciśnij by wybrać sposób zapisania nazwiska (i jego prezentacji na liście)</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Firma - telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Firma - fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Sluzbowa komorka</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Domyslny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Adresy e-mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Telefon domowy</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Dom - fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Prywatna komorka</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Zawod</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Kierownik</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Wspolmalzonek</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Plec</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Przydomek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Dzieci</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Pokazuj jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Stanowisko</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Wydzial</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Firma - ulica</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Firma - miasto</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Firma - region</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Firma - kod pocztowy</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Firma - kraj</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Firma - pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Firma - strona WWW</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Dom - ulica</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Dom - miasto</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Dom - region</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Dom - kod pocztowy</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Dom - kraj</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Strona domowa</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notatki</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index c5bc5d4..dd5c7b8 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -1,962 +1,1032 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielone</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(kilka)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Służbowe</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Osobiste</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Kilka)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nowa kategoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nowa kategoria </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Edycja kategorii</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplikacja</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Tu są kategorie</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globalne</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Zaznacz kategorie, do których należy ten dokument.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Wpisz tu nową kategorię. Wciśnij &lt;b&gt;Dodaj&lt;/b&gt; by dodać ją do listy.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Wpisz nową kategorię po lewej i wciśnij by ją dodać do listy.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Wciśnij by usunąć podświetloną kategorię.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Zaznacz aby udostępnić tą właściwość wszystkim aplikacjom.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielone</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Przepraszam, inna aplikacja
 edytuje kategorie.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Edytuj kategorie</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Pokaż Styczeń wybranego roku</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Pokaż poprzedni miesiąc</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Pokaż następny miesiąc</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Pokaż Grudzień wybranego roku</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Zamknij wybór plików</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Pokaż dokumenty tego pliku</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Widok dokumentu</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Pokaż dokumenty tej kategorii</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Kliknij aby wybrać dokument z listy</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, albo wybierz &lt;b&gt;Nowy dokument&lt;/b&gt; aby stworzyć nowy dokument.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Kliknij i przytrzymaj by zobaczyć właściwości dokumentu.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Znajdź</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Tekst nie został znaleziony.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Osiągnąłem koniec, zaczynam od początku</translation>
+        <translation type="obsolete">Osiągnąłem koniec, zaczynam od początku</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Znajdź</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Czego szukać:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Zacznij szukać od:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Gru 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Rozróżniaj wielkość liter</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Szukaj wstecz</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Widok dokumentu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Usunięcie pliku nie udało się.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopia</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Skopiowanie pliku nie udało się.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Przeniesienie pliku nie udało się.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Dysk twardy</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Właściwości</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentarz:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Szybkie ładowanie (zajmuje pamięć)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emituj</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Nośnik, na którym znajduje się dokument.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Nazwa tego dokumentu.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Ładuj aplikację do pamięci by była szybko dostępna.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Usuń ten dokument.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Twórz kopię tego dokumentu.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emituj ten dokument do innego urządzenia.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Używaj rotacji użytkownika</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informacje o właścicielu</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Podaj hasło</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Jest problem z utworzeniem
 Informacji Konfiguracyjnych
 dla tego programu.
 
 Zwolnij więcej pamięci i
 spróbuj ponownie.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Nie można utworzyć plików startowych
 Zrób więcej miejsca w pamięci
 przed wprowadzeniem danych</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Nie można ustawić alarmu
 Zwolnij więcej pamięci i spróbuj ponownie.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>R</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dzień</translation>
     </message>
     <message>
         <source>month</source>
         <translation>miesiąc</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Jestes pewnien ze chces zusunac
  %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielony</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adres służbowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Adres e-mail: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. dom: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Faks dom: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Tel. kom. dom: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>WWW dom: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>WWW firma:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Biuro: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tel. firma: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Faks firma: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Tel. kom. firma: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager firma: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Zawód: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asystent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Menadźer: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mężczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Płeć: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Urodziny: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Pocznica:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Pseudonim: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Tytuł</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imię</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imię</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Przyrostek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Tytuł służbowy</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Wydział</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tel. firma</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Faks firma</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Tel. kom. firma</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Domyślny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Adresy e-mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tel. dom</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Faks dom</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Tel. kom. dom</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulica firma</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Miasto firma</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Region firma</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Kod poczt. firma</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Kraj firma</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager firma</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>WWW firma</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Zawód</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Menadżer</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Ulica dom</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Miasto dom</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Region dom</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Kod poczt. dom</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Kraj dom</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>WWW dom</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Partner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Płeć</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Pseudonim</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Dzieci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupy</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nowy dokument</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Kliknij aby zamknąć to okno porzucając zmiany.</translation>
+        <translation type="obsolete">Kliknij aby zamknąć to okno porzucając zmiany.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Kliknij aby zamknąć to okno.</translation>
+        <translation type="obsolete">Kliknij aby zamknąć to okno.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Kliknij aby zamknąć to okno akceptując zmiany.</translation>
+        <translation type="obsolete">Kliknij aby zamknąć to okno akceptując zmiany.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Kliknij aby zmienić okno w przesuwane.</translation>
+        <translation type="obsolete">Kliknij aby zmienić okno w przesuwane.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Kliknij aby rozszerzyć okno na całą dostępną przestrzeń.</translation>
+        <translation type="obsolete">Kliknij aby rozszerzyć okno na całą dostępną przestrzeń.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Ot&gt;Wyczerpująca pomoc dla tej aplikcji jest niedostępna, ale jest pomoc kontekstowa.&lt;p&gt;Aby jej użyć:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknij i przytrzymaj przycisk pomocy.&lt;li&gt;gdy tytuł okna zmieni się na &lt;b&gt;Co to jest...&lt;/b&gt;, kliknij na dowolny element.&lt;/ol&gt;&lt;/Ot&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Co to jest...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Czy na pewno chcesz usunąć
 %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Sty</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Lut</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Kwi</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Cze</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Lip</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Sie</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Wrz</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Paź</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Gru</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Blad</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>dokument %1</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Kliknij aby zamknąć to okno porzucając zmiany.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Kliknij aby zamknąć to okno.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Kliknij aby zamknąć to okno akceptując zmiany.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Kliknij aby rozszerzyć okno na całą dostępną przestrzeń.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Karta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Dysk twardy</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Karta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Dysk twardy SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Nośnik wewnętrzny</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Pamięć wewnętrzna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Karta MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>nie znaleziono programu citytime</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Aby móc wybierać strefy czasowe
 zainstaluj program citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nie mogę ustawić alarmu.
 Zwolnij więcej miejsca w pamięci 
 i spróbuj ponownie</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 plików</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Wszystkie %1 plików</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Wszystkie pliki</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index 670dedc..3891b71 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -1,359 +1,386 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Język</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Czas i data</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Informacje osobiste</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation>Dokumenty</translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problem z aplikacją</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 nie odpowiada.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Czy chcesz wymusić zakończenie aplikacji?&lt;/p&gt;</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>&lt;qt&gt;&lt;p&gt;Szybkie ładowanie tej aplikacji zostało wyłączone. Kliknij i przytrzymaj na ikonie aplikacji by je ponownie włączyć.&lt;/qt&gt;</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>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; został zamknięty po otrzymaniu sygnału %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Aplikacja zamknieta</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Aplikacja nie znaleziona</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nie można zlokalizować aplikacji &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Nie można znaleźć aplikacji %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Stan baterii</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Bateria słaba</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Wstecz</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Dalej &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Kliknij gdziekolwiek na ekranie by kontynuować.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Proszę czekać, ładuję ustawienia %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Proszę czekać...</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Kończ</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
         <translation>PierwszeTło</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unikod</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Brak aplikacji</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Brak aplikacji zdefiniowanych dla tego dokumentu.&lt;p&gt; Typ to %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Pokaż jako tekst</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Wyszukiwanie Dokumentów...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Pokazuj ikony</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Pokazuj listę</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>&lt;b&gt;Zakładka Dokumenty&lt;p&gt;została wyłączona.&lt;p&gt;Aby ją ponownie włączyć wejdź w Ustawienia-&gt;Launcher-&gt;Dokumenty&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Widok Dokumentu</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Wszystkie typy</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>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Tryb bezpieczny</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Menedżer wtyczek...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Restartuj Qtopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Pomoc...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informacje</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>&lt;p&gt;Data systemowa wydaje się być nieprawidłowa.
 (%1)&lt;/p&gt;&lt;p&gt;Czy chcesz poprawić zegar?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">Poziom energii jest krytyczny!
 Wylacz urzadzenie az do naladowania baterii!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
         <translation type="obsolete">Poziom energii bardzo niski.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">Bateria zapasowa sie rozladowuje.
 Doladuj baterie zapasowa.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>wizytowka</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Tryb bezpieczny</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>&lt;P&gt;Wystąpił błąd systemu i jest on teraz w Trybie Bezpiecznym. W tym trybie nie są ładowane wtyczki. Używajac Menedżera Wtyczek możesz wyłączyć wtyczki, które powodują awarię systemu.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Menedżer wtyczek...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Stan pamięci</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Mało pamięci
 Zapisz dane.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Krytyczny brak pamięci
 Zakończ natychmiast 
 tą aplikację.</translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation>OSTRZEŻENIE</translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation>&lt;p&gt;Poziom naładowania baterii jest krytyczny!&lt;p&gt;Wyłącz urządzenie do czasu podłączenia do sieci</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation>Poziom naładowania baterii jest bardzo niski.</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>&lt;p&gt;Poziom naładowania baterii zapasowej jest bardzo niski&lt;p&gt;Naładuj ją</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Zamknij</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Zamknij Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Restartuj system</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Restartuj Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Zamknij system</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Te opcje zamykające zostały pierwotnie dodane do użytku deweloperów i dla testów Opie. W normalnym środowisku ich używanie nie jest konieczne.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Zamykanie systemu...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Połączenie synchronizacyjne</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Nieautoryzowany system zada dostepu do tego urzadzenia.&lt;p&gt;Jesli uzywasz Qtopia Desktop w wersji wczesniejszej niz 1.5.1, zaktualizuj ja.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Odmów</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Nierozpoznany system żąda dostępu do tego urządzenia.&lt;p&gt;Jeśli zainicjowałeś synchronizację po raz pierwszy  to jest to normalne.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Zezwól</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>&lt;p&gt;Nieautoryzowany system żąda dostępu do tego urządzenia.&lt;p&gt;Jeśli używasz Qtopia Desktop w wersji starszej niż 1.5.1, to zaktualizuj ją albo zmień ustawienia na korzystanie z IntelliSync.</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>Przerwij</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronizacja:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/security.ts b/i18n/pl/security.ts
index 25d7db7..ad04fee 100644
--- a/i18n/pl/security.ts
+++ b/i18n/pl/security.ts
@@ -1,263 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Ustaw haslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Podaj haslo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Haslo bledne</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Haslo nieprawidlowe.
 Dostep zabroniony</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Wpisz nowe haslo</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Powtorz nowe haslo</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Ustawienia bezpieczenstwa</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Wyczysc haslo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Wymaj hasla po uruchomieniu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronizuj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Akceptuj synchronizacje z sieci:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Brak</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Haslo zabezpieczajace pozwala na minimalny poziom zabezpieczen do tego urzadzenia.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (domyslny)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Haslo</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Loguj automatycznie</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/pl/zsafe.ts b/i18n/pl/zsafe.ts
index cffe87a..2eb8238 100644
--- a/i18n/pl/zsafe.ts
+++ b/i18n/pl/zsafe.ts
@@ -1,829 +1,889 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation>ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Czy chcesz usunąć?</translation>
+        <translation type="obsolete">Czy chcesz usunąć?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Usuń</translation>
+        <translation type="obsolete">&amp;Usuń</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nie usuwaj</translation>
+        <translation type="obsolete">&amp;Nie usuwaj</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Edytuj wpis</translation>
+        <translation type="obsolete">Edytuj wpis</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Nazwa</translation>
+        <translation type="obsolete">Nazwa</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Użytkownik</translation>
+        <translation type="obsolete">Użytkownik</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Hasło</translation>
+        <translation type="obsolete">Hasło</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation>Komentarz</translation>
+        <translation type="obsolete">Komentarz</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation>Pole 4</translation>
+        <translation type="obsolete">Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation>Pole 5</translation>
+        <translation type="obsolete">Pole 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Nowy wpis</translation>
+        <translation type="obsolete">Nowy wpis</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Nazwa wpisu musi być inna
+        <translation type="obsolete">Nazwa wpisu musi być inna
 niż nazwa kategorii.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Szukaj</translation>
+        <translation type="obsolete">Szukaj</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Wpis nie znaleziony</translation>
+        <translation type="obsolete">Wpis nie znaleziony</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <translation type="obsolete">&amp;OK</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation>Pole 2</translation>
+        <translation type="obsolete">Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation>Pole 3</translation>
+        <translation type="obsolete">Pole 3</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Wszystkie</translation>
+        <translation type="obsolete">Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Tekst</translation>
+        <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Remove text file</source>
-        <translation>Usuń plik tekstowy</translation>
+        <translation type="obsolete">Usuń plik tekstowy</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Nie udało się usunięcie pliku tekstowego.</translation>
+        <translation type="obsolete">Nie udało się usunięcie pliku tekstowego.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
-        <translation>Brak dokumentu.
+        <translation type="obsolete">Brak dokumentu.
 Musisz stworzyć nowy dokument</translation>
     </message>
     <message>
         <source>Export text file</source>
-        <translation>Eksportuj plik tekstowy</translation>
+        <translation type="obsolete">Eksportuj plik tekstowy</translation>
     </message>
     <message>
         <source>Import text file</source>
-        <translation>Importuj plik tekstowy</translation>
+        <translation type="obsolete">Importuj plik tekstowy</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Nie udał się eksport pliku tekstowego.</translation>
+        <translation type="obsolete">Nie udał się eksport pliku tekstowego.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Nie udał się import pliku tekstowego.</translation>
+        <translation type="obsolete">Nie udał się import pliku tekstowego.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Wpisz hasło</translation>
+        <translation type="obsolete">Wpisz hasło</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Błędne hasło.
+        <translation type="obsolete">Błędne hasło.
 
 ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Błędne hasło.
+        <translation type="obsolete">Błędne hasło.
 Spróbuj ponownie?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Tak</translation>
+        <translation type="obsolete">&amp;Tak</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nie.</translation>
+        <translation type="obsolete">&amp;Nie.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Pusty dokument lub
+        <translation type="obsolete">Pusty dokument lub
 błędne hasło.
 Kontynuować?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nie</translation>
+        <translation type="obsolete">&amp;Nie</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Tak.</translation>
+        <translation type="obsolete">&amp;Tak.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Hasło jest puste.
+        <translation type="obsolete">Hasło jest puste.
 Wpisz ponownie.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Powtórz hasło</translation>
+        <translation type="obsolete">Powtórz hasło</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Hasła muszą być identyczne.
+        <translation type="obsolete">Hasła muszą być identyczne.
 Wpisz ponownie.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
-        <translation>Czy chcesz zapisać</translation>
+        <translation type="obsolete">Czy chcesz zapisać</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
-        <translation>
+        <translation type="obsolete">
 teraz?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Zapisz</translation>
+        <translation type="obsolete">&amp;Zapisz</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nie zapisuj</translation>
+        <translation type="obsolete">&amp;Nie zapisuj</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Plik z hasłem zapisany.</translation>
+        <translation type="obsolete">Plik z hasłem zapisany.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Czy chcesz zapisać
+        <translation type="obsolete">Czy chcesz zapisać
 przed wyjściem?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>&amp;Zapisz z
+        <translation type="obsolete">&amp;Zapisz z
 nowym
 hasłem</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategoria</translation>
+        <translation type="obsolete">Kategoria</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Czekaj</translation>
+        <translation type="obsolete">Czekaj</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Zbieram ikony...</translation>
+        <translation type="obsolete">Zbieram ikony...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Twórz nowy dokument ZSafe</translation>
+        <translation type="obsolete">Twórz nowy dokument ZSafe</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
-        <translation>Teraz musisz dwukrotnie
+        <translation type="obsolete">Teraz musisz dwukrotnie
 podać hasło dla nowego
 dokumentu.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Otwórz dokument ZSafe</translation>
+        <translation type="obsolete">Otwórz dokument ZSafe</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Zapisz dokument ZSafe jako..</translation>
+        <translation type="obsolete">Zapisz dokument ZSafe jako..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Menedżer haseł dla Zaurusa&lt;br&gt;</translation>
+        <translation type="obsolete">Menedżer haseł dla Zaurusa&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation>ZSafe wersja 2.1.2-jv01b&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe wersja 2.1.2-jv01b&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>autor: Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">autor: Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>tłumaczenia: Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">tłumaczenia: Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation>ZSafe wersja 2.1.2&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe wersja 2.1.2&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Pole 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Informacje:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nowy wpis</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Pole 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>PlikDlg</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>filtr typu pliku</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>Lista wyboru typu pliku
 
 edytuj lub wybierz filtr</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>potwierdza wybór i zamyka formularz</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>anuluje wybór i zamyka formularz</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Anuluj</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>pokazuje wybraną nazwę pliku</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Edycja nazwy pliku
 
 pokazuje wybrany plik
 i pozwala na edycję jego nazwy</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>Lista wyboru katalogu
 edytuj lub wybierz nazwę katalogu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>size</source>
         <translation>rozmiar</translation>
     </message>
     <message>
         <source>type</source>
         <translation>typ</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>lista katalogów</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Lista katalogów
 
 pokazuje listę katalogów i plików</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>katalog</translation>
     </message>
     <message>
         <source>file</source>
         <translation>plik</translation>
     </message>
     <message>
         <source>link</source>
         <translation>link</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Proszę czekać...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Nie można utworzyć katalogu
 %1
 
 ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Zapisz dokument</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Zapisz dokument z &amp;hasłem</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>&amp;Eksportuj plik tekstowy</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>&amp;Importuj plik tekstowy</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Usuń plik tekstowy</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Otwieraj wpisy rozwinięte</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Koniec</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Plik</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nowa</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Edytuj</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Usuń</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategoria</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Wytnij</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopiuj</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>W&amp;klej</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Szukaj</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Wpis</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>P&amp;omoc</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Pole 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Nowy dokument</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Otwórz dokument</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Zapisz dokument jako..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation>Nie można utworzyć katalogu
 .../Documents/application
 
 ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation>Nie można utworzyć katalogu
 .../Documents/application/zsafe
 
 ZSafe zostanie zamknięty.</translation>
     </message>
     <message>
         <source>New entry</source>
         <translation>Nowy wpis</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Edytuj kategorię lub wpis</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Usuń kategorię lub wpis</translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation>Znajdź wpis</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished">Wszystkie</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished">Tekst</translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished">Usuń plik tekstowy</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished">Brak dokumentu.
+Musisz stworzyć nowy dokument</translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished">Eksportuj plik tekstowy</translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished">Importuj plik tekstowy</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished">Czy chcesz zapisać</translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished">
+teraz?</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished">Teraz musisz dwukrotnie
+podać hasło dla nowego
+dokumentu.</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe wersja 2.1.2-jv01b&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe wersja 2.1.2&lt;br&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index 63b6d4a..4b836d2 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -1,1514 +1,1518 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Escolher</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Enviar EMail</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Irradiar Entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Dados</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar os Meus Dados</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Meus Dados</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Não há espaço para
 guardar os dados. 
 Liberte algum e tente de novo.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar cartão de visita</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Procura</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Gravar todos os Dados</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Não Encontrado</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartões</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Cartão</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Iniciar Procura</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Tipo de ficheiro correcto?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sim</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Não</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Não foi encontrado nenhum contacto para esta pesquisa!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>O ficheiro selecionado
 não tem a extensão &quot;.vcf&quot;.
 Tem a certeza que o quer abrir?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Adicionar Contacto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Tem a certeza que quer adicionar o
 contacto para %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Sim para &amp;Todos</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exportar vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Tem de selecionar um contacto!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Tem de selecionar um nome de ficheiro!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Tipo de Pesquisa</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Expressões Regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar expressões (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Ignorar letras grandes/pequenas</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>E-Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Preferir QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Preferir Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Atenção: O QT-Mail só 
 está disponível para o 
 SHARP. O Opie-Mail é
 livre e está disponível em
 todos os dispositivos!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configurações da Procura</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordem</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Selecione a Ordem dos Contactos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Clique na pasta para seleccionar uma</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Configurações para o estilo da procura</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>A procura usa expressões regulares se for selecionado</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>A procura usa apenas expressões simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Se selecionado, a procura diferencia entre os caractéres grandes e pequenos</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Tamanho da fonte para a lista e para a vista dos cartões</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Configurações da fonte para a lista e para a vista de cartões</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Usar a aplicação de mail da Sharp, se disponível</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Usar a aplicação de mail do Opie, se disponível</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Mover o atributo selecionado para cima uma linha</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>MoMover o atributo selecionado para baixo uma linha</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista de todos os atributos disponíveis</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Adicione os atributos selecionados da lista abaixo para a lista acima</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Remove os atributos selecionados da lista acima</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Ordena (cima -&gt; baixo) define o contacto primário a mostrar na segunda coluna da vista em lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Ferramenta-/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixo</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Mudar para menus ou barras de ferramentas fixas depois de reiniciar a aplicação!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Amovível</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Mudar para menus ou barras de ferramentas amovíveis depois de reiniciar a aplicação!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Emprego</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código Postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Inglaterra</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japão</translation>
     </message>
     <message>
         <source>France</source>
         <translation>França</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemanha</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introduza Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nome</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albânia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argetina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Austrália</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Áustria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbeijão</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutam</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Ilha Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgária</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Ilhas Caiman</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Ilha da Natividade</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colômbia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Ilha do Cook </translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Cote d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croácia</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Chipre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Républica Checa</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dinamarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Républica Dominicana</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Leste</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guiné Equatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estónia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiópia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Ilhas Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Ilhas Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fidji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlândia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guiné Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinésia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabão</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gâmbia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grécia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenelândia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guiné</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guiana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hungria</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islândia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Índia</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonésia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Itália</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Casaquistão</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Quénia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Coreia</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituânia</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedónia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malásia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldivas</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritânia</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>México</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronésia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Mónaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongólia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marrocos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Moçambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namíbia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Holanda</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nova Caledónia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nova Zelândia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicarágua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigéria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nova Guiné</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguai</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polónia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ilha da Reunião</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Roménia</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rússia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruânda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lúcia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>São Marinho</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arábia Saudita</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seicheles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Serra Leona</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapura</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Eslováquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Eslovénia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Ilhas Salomão</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somália</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>África do Sul</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Espanha</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Siri Lanca</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Santa Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudão</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suécia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suiça</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Tailândia</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikstan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzânia</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailândia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunísia</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistão</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrânia</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguai</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistão</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Ilhas Virgem</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Sahara Ocidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Juguslávia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zâmbia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabué</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afeganistão</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antártica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Arménia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolívia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Camarões</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Guana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guiné-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstão</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Territórios Ocupados Palestinianos</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Ilhas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Escolha para introduzir o ultimo, do meio e primeiro nome</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>Introduza o nome completo directamente. Se tiver um apelido com várias palavras (por exemplo, &quot;da Silva&quot;), escreva &lt;apelido&gt;,&lt;nomes&gt; tal como: &quot;da Silva, Rosa Margarida&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>O título (emprego)..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Exemplo: &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>O local de trabalho do contacto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Use para escolher o atributo a mudar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Use para escolher o formato para gravar o nome e mostrar na lista</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Telefone (Empresa)</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax (Empresa)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">EMail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Outros EMails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Telefone (Pessoal)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax (Pessoal)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Telemóvel (Pessoal)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Chefe</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Alcunha</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Filhos</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Gravar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Título Profissional</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Empresa</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Rua (Empresa)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Cidade (Empresa)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Estado (Empresa)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Cód. Postal (Empresa)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">País (Empresa)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Pager (Empresa)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">WebSite (Empresa)</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Rua (Pessoal)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Cidade (Pessoal)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Estado (Pessoal)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Cód. Postal (Pessoal)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">País (Pessoal)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">WebSite (Pessoal)</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index c1928b6..24ae8f6 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -1,972 +1,1042 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Emprego</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Pessoal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova Categoria</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Editar Categoria</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorias</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorias Aqui</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Escolha as categorias para este documento.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Introduza uma categoria nova aqui. Prima &lt;b&gt;Adicionar&lt;/b&gt; para adicionar à lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Introduza uma nova categoria e prima &quot;Adicionar&quot; para a adicionar à lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Prima para apagar a categoria selecionada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Active para marcar esta propriedade como disponível a todas as aplicações.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Há outra aplicação a editar
 as categorias.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorias</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostrar Janeiro no ano selecionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostrar o mês anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostrar o mês seguinte</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostrar Dezembro no ano selecionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fechar o Selector de Ficheiros</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostar documentos deste tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vista de Documentos</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostrar documentos nesta categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Clique para selecionar um documento da lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, ou selecione &lt;b&gt;Novo Documento&lt;/b&gt; para criar um documento novo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Clique e espere para as propriedades do documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Texto não encontrado.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Chegou ao fim, a voltar ao início</translation>
+        <translation type="obsolete">Chegou ao fim, a voltar ao início</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Procurar o quê:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Iniciar Procura em:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dez 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensível a letra grande/pequena</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Procurar para trás</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vista de Documentos</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Falhou a remoção do ficheiro.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copia de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Falhou a cópia do ficheiro.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Falhou ao mover o documento.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentário:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carregamento rápido (consome mais memória)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>O sítio onde o documento reside.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>O nome deste documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Pre-carrega a aplicação para que esteja disponível instantaneamente.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Apagar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Fazer uma cópia do documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Irradiar este documento para outro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotação personalizada</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informação do Proprietário</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Password</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Houve um problema ao criar
 a informação de configuração 
 para este programa.
 
 Liberte algum espaço e tente
 novamente.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Não foi possível criar os ficheiros
 de inicialização.
 
 Liberte algum espaço e tente
 novamente</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Não foi possível gravar os dados
 do alarme.
 
 Liberte algum espaço e tente
 novamente.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço (Emprego):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço (Pessoal):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Endereços de Correio:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone (Pessoal):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax (Pessoal):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Telemóvel (Pessoal):</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>WebSite (Pessoal):</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>WebSite (Emprego):</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone (Emprego):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax (Emprego):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Telemóvel (Emprego):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager (Emprego):</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Chefe:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposa:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Nascimento:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título (Pessoal)</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título (Emprego)</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Empresa</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefone (Emprego)</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax (Emprego)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Telemóvel (Emprego)</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>EMail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Outros EMails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefone (Pessoal)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (Pessoal)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Telemóvel (Pessoal)</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Endereço (Emprego)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Cidade (Emprego)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Estado (Emprego)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Cód. Postal (Emprego)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País (Emprego)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager (Emprego)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>WebSite (Emprego)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Chefe</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Endereço (Pessoal)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Cidade (Pessoal)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Estado (Pessoal)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Cód. Postal (Pessoal)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>País (Pessoal)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>WebSite (Pessoal)</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alcunha</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Filhos</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Novo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Clique para fechar esta janela, perdendo as alterações.</translation>
+        <translation type="obsolete">Clique para fechar esta janela, perdendo as alterações.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Clique para fechar esta janela.</translation>
+        <translation type="obsolete">Clique para fechar esta janela.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Clique para fechar esta janela e aplicar as alterações.</translation>
+        <translation type="obsolete">Clique para fechar esta janela e aplicar as alterações.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Clique para tornar esta janela movível.</translation>
+        <translation type="obsolete">Clique para tornar esta janela movível.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Clique para maximizar esta janela para o todo o ecrâ disponível.</translation>
+        <translation type="obsolete">Clique para maximizar esta janela para o todo o ecrâ disponível.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Não existe manual de instruções para esta aplicação, no entanto existe ajuda contextual.&lt;p&gt;Para usar a ajuda contextual:&lt;p&gt;&lt;ol&gt;&lt;li&gt;clique e espere no botão de ajuda.&lt;li&gt;quando a barra do título mostrar &lt;b&gt;O que é isto...&lt;/b&gt;, clique num controlo.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>O que é isto...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Tem a certeza que quer apagar
 %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Erro</translation>
     </message>
     <message>
         <source>Could not find the application </source>
         <translation type="obsolete">Não foi possível encontrar a aplicação</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>Could not start the application </source>
         <translation type="obsolete">Não foi possível iniciar a aplicação</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>documento %1</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Clique para fechar esta janela, perdendo as alterações.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Clique para fechar esta janela.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Clique para fechar esta janela e aplicar as alterações.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Clique para maximizar esta janela para o todo o ecrâ disponível.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memória Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Cartão MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>O executável dos Fusos Horários não foi encontrado</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Para poder mudar de fuso horário terá
 de instalar a aplicação.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Não foi possível gravar os dados do alarme.
 Liberte algum espaço e tente novamente</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>ficheiros %1</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos os ficheiros %1</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos os ficheiros</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index cff1f70..af3cff7 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -1,358 +1,385 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Hora e Data</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Informação Pessoal</translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema na Aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;A aplicação %1 não está a responder.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Quer forçar o término da aplicação?&lt;/p&gt;</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>&lt;qt&gt;&lt;p&gt;Foi desactivado o carregamento rápido da aplicação. Toque e espere no icon da aplicação para reactivar.&lt;/qt&gt;</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>&lt;qt&gt;&lt;b&gt;A aplicação %1 terminou com o código %2.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>A aplicação terminou</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Não foi encontrada a aplicação</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível localizar a aplicação &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível encontrar a aplicação %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Estado da Bateria</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Bateria Fraca</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Voltar</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>Próxima &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Toque no ecrâ para continuar.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Aguarde um momento. A carregar a configuração de %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Aguarde um momento...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
         <translation>Ecrâ de Fundo no Primeiro Uso</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Finalizar</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Execução</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Execução</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nenhuma aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Não há nenhuma aplicação definida para este tipo de documento.&lt;p&gt;O tipo do documento é %1.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Ver como texto</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;A procurar documentos...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vista em Icones</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vista em Lista</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>Todos os tipos</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vista de Documentos</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>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Modo Salvaguarda</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestor de &quot;Plugins&quot;...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Ajuda...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informação</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>&lt;p&gt;A data do sistema não parece ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">O nível de energia está muito baixo.
 Desligue o dispositivo ou ligue-o à corrente!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
         <translation type="obsolete">O nível de energia da bateria está muito baixo.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">O nível de energia da bateria extra está baixo.
 Deve carregá-la.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Cartão de Visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Modo de Salvaguarda</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>&lt;p&gt;Ocorreu um erro ao iniciar. O sistema está agora em modo de salvaguarda e os &quot;plugins&quot; não foram carregados. Poderá usar o gestor de &quot;plugins&quot; para desactivar os que estiverem a causar o erro.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestor de &quot;Plugins&quot;...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Estado da Memória</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Memória Baixa
 Grave os seus dados.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Memória Criticamente em Baixo
 Termine esta aplicação imediatamente.</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>A desligar...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminar o Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Reiniciar Dispositivo</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Estas operações estão disponíveis principalmente para desenvolvimento e testes do sistema Opie. Num ambiente normal, estes conceitos são desnecessários.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Ligação de Sincronização</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;Se estiver a usar uma versão do Ambiente Qtopia mais antigo que a 1.5.1, deverá actualizá-lo.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Rejeitar</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;É normal se for o primeiro acesso para sincronização.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Permitir</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade 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>Abortar</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>A Sincronizar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/security.ts b/i18n/pt/security.ts
index 6ebc763..3b2aa92 100644
--- a/i18n/pt/security.ts
+++ b/i18n/pt/security.ts
@@ -1,263 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Mudar Chave</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar chave</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introduza chave</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Chave incorrecta</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>A chave introduzida está incorrecta.
 Acesso negado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Introduza nova chave</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Reintroduza a chave</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configurações de Segurança</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar chave</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Limpar chave</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Pedir chave ao ligar</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (omissão)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhuma</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;p&gt;O uso de chave permite uma protecção mínima contra acessos pontuais ao dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Palavra Chave</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Entrar</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Entrar Automaticamente</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/pt/zsafe.ts b/i18n/pt/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/pt/zsafe.ts
+++ b/i18n/pt/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index a351653..a6ac7f4 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -1,1514 +1,1518 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Pick</source>
         <translation>Escolha</translation>
     </message>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossível salvar informação.
 Libere algum espaço e
 tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatos</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escrever E-mail Para</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Enviar Registro</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatos - Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Busca</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Salvar Tudo</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Não Encontrado</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartões</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Cartão</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Iniciar Busca</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Tipo de arquivo correto ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sim</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Não</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Nenhum contato encontrado para esta busca!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>O arquivo selecionado
 não termina em &quot;.vcf&quot;.
 Deseja mesmo abrí-lo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Adicionar Contato ?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Deseja mesmo adicionar contato para
 %1 ?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Todos Sim</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exportar vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Você deve selecionar um contato !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Você deve especificar um nome de arquivo !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Tipo de Busca</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>usar Expressões Regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar Máscaras (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensível à Caixa</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correio</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Usar QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Usar Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Aviso: QT-Mail somente é
 fornecido na ROM padrão
 da SHARP. Opie-Mail é
 forcnecido livremente !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configurações de Busca</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordem</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Selecionar Ordem de Contato:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>P/ Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>P/ Baixo</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Clique em uma guia para selecionar</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Configurações do tipo de busca</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>O campo de busca aceitará expressões regulares se marcado</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>O campo de busca aceitará apenas máscaras simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Se marcado, a busca diferenciará maiúsculas e minúsculas</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Tamanho da fonte para visão em lista e cartão</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Configuração de fonte para visão em lista e cartão</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Use a aplicação de correio da Sharp se disponível</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Use correio OPIE se instalado</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Mover atributo selecionado uma linha acima</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Mover atributo selecionado uma linha abaixo</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista de todos os atributos disponíveis</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Adiciona o atributo selecionado na lista abaixo à lista acima</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Rmove o atributo selecionado da lista acima</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>A ordem (Cima -&gt; Baixo) define o primeiro contato mostrado na segunda coluna da visão em lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Barra de Ferramentas/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixo</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Alterna entre para barra de ferramentas/menu fixa após reiniciar a aplicação !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Móvel</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Alterna para barra de ferramentas/menu móveis após reiniciar a aplicação !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título Profissional</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Comercial</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Residencial</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>CEP</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Reino Unido</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japão</translation>
     </message>
     <message>
         <source>France</source>
         <translation>França</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemanha</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Escrever Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nome</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albânia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Austrália</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Áustria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijão</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutão</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Ilhas Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgária</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Ilhas Cayman</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chade</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Ilha da Natividade</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colômbia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Ilha Cook</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Costa do Marfim</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croácia</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Chipre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>República Checa</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dinamarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>República Dominicana</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Leste</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egito</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guiné Equatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estônia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiópia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Ilhas Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Ilhas Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlândia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guiana Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinésia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabão</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gâmbia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Geórgia</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grécia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenlândia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guiné</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guiana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Vaticano</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hungaria</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islândia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonésia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Itália</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordânia</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Cazaquistão</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Quênia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Coréia</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Látvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Líbano</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesoto</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituânia</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedônia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malásia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldivas</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritânia</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>México</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronésia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Mônaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongólia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marocos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Moçambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namíbia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Holanda</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nova Caledônia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nova Zelândia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicarágua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigéria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nova Guiné</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguai</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polônia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunião</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Romênia</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lúcia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Árabia Saudita</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Serra Leoa</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapura</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovaquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Ilhas Salomão</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somália</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>África do Sul</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Espanha</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudão</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Suazilândia</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suécia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suiça</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadjiquistão</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzânia</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailândia</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunísia</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turcomenistão</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrânia</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguai</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbequistão</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Ilhas Virgens</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Saara Ocidental</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Iêmen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Iugoslávia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zâmbia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbábue</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Aniverário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Casamento</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afeganistão</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antárctica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armênia</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolívia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Camarões</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Gana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guiné-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Quirguizstão</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Áreas Palestinas Soberanas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Ilhas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnã</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pressione para entrar com sobrenome, nome do meio e nome</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>Entre o nome completo diretamente ! Se você tem um sobrenome com várias palavras (por exemplo &quot;Da Silva&quot;), escreva &lt;sobrenome&gt;,&lt;nomes&gt; desta forma: &quot;Da Silva, José Maria&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>O Título Profissional</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Algo como &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>O local de trabalho do contato</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pressione para selecionar o atributo a alterar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pressione para selecionar como o nome será armazenado (e como será mostrado na visão em lista)</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Telefone Comercial</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax Comercial</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Celular Comercial</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Tefone Residencial</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax Residencial</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Celular Pessoal</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Gerente</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Aniverário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Crianças</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Arquivar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Título Profissional</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Compania</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Endereço Comercial</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Cidade</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Estado</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">CEP</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">País</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Pager Comercial</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Página Web Comercial</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Endereço Residencial</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Cidade</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Estado</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">CEP</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">País</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Página Web Pessoal</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index f567629..777555e 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -1,974 +1,1044 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (mult.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Negócios</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Pessoal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Mult.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova Categoria </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorias Vão Aqui</translation>
     </message>
     <message>
         <source>Category Edit</source>
         <translation>Editar Categoria</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorias</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Marque as categorias a que este documento pertence.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Entre a nova categoria aqui. Pressione &lt;b&gt;Adicionar&lt;&gt; para adicioná-la a lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Entre uma nova categoria à esquerda e pressione para adicioná-la a lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pressione para remover a categoria destacada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Marque para tornar esta propriedade disponível para todas as aplicações.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Desculpe, outra aplicação está 
 editando as categorias.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorias</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostra Janeiro do ano selecionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostra o mês anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostra o próximo mês</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostra Dezembro do ano selecionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fechar Seletor de Arquivo</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostrar documentos deste tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Visualizador de Documentos</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostrar documentos nesta categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Clique para selecionar um documento da lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, ou selecione &lt;b&gt;Novo Documento&lt;/b&gt; para cliar um novo documento.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Clique e segure para mostrar as propriedades do documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Seqüência não encontrada.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Fim atingido, reiniciando a partir do início</translation>
+        <translation type="obsolete">Fim atingido, reiniciando a partir do início</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Começar procura em:</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Procurar p/ trás</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Localizar:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensível a caixa</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dez 02 01</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>File deletion failed.</source>
         <translation>Remoção de arquivo falhou.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Cópia de </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicata</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Cópia de arquivos falhou.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Falhou ao mover Documento.</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Visualizador de Documentos</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Beam</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carregamento rápido (consome memória)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentário:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>O meio em que o documento reside.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>O nome deste documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Pré-carregue esta aplicação para que ela esteja disponível imediatamente.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Apagar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Fazer uma cópia deste documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Envia este documento para outro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotação personalizada</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informações sobre o Proprietário</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entre a senha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Y</source>
         <translation>S</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Tem certeza que deseja apagar
  %1 ?</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Impossível criar arquivos de inicialização
 Por favor, libere algum espaço
 antes de inserir dados</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Impossível agendar alarme.
 Libere algum espaço e tente novamente.</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Houve um problema criando
 Informações de Configuração 
 para este programa.
 
 Por favor, libere algum espaço e
 tente novamente.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço Com.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço Res.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Endereços de E-mail: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Fone Res.: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Resid.: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Celular Pess.: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pág. Web Pessoal: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pág. Web Comercial: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Fone Comercial: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Comercial: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Celular Comercial: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Comercial: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gerente: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masc</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Fem</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sexo: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposo(a): </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Aniversário: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniv. de Casamento: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apelido: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título Prof</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Companhia</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Fone Comercial</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Comercial</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Celular Comercial</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Fone Res</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Resid</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Celular Pess</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Endereço Comercial</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Cidade Comercial</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>UF Comercial</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CEP Comercial</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País Comercial</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager Comercial</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pág. Web Comercial</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Gerente</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Endereço Res</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Cidade Res</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>UF Res</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>CEP Res</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>país Res</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pág. Web Pessoal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Esposo(a)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniv. de Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Crianças</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Novo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Clique para fechar esta janela descartando as mudanças.</translation>
+        <translation type="obsolete">Clique para fechar esta janela descartando as mudanças.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Clique para fechar esta janela.</translation>
+        <translation type="obsolete">Clique para fechar esta janela.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Clique para fechar esta janela e salvar as mudanças.</translation>
+        <translation type="obsolete">Clique para fechar esta janela e salvar as mudanças.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Clique para tornar esta janela móvel.</translation>
+        <translation type="obsolete">Clique para tornar esta janela móvel.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Marque para que esta janela ocupe toda a área da tela.</translation>
+        <translation type="obsolete">Marque para que esta janela ocupe toda a área da tela.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Ajuda completa não está disponível para esta aplicação, porém existe ajuda sensível ao contexto.&lt;p&gt;Para usar a ajuda sensível ao contexto:&lt;p&gt;&lt;ol&gt;&lt;li&gt;clique e segure no botão de ajuda.&lt;li&gt;quando a barra de título mostrar &lt;b&gt;O que é isto...&lt;/b&gt;, clique em qualquer controle.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>O que é isso...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Tem certeza que você deseja apagar
 %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Erro</translation>
     </message>
     <message>
         <source>Could not find the application </source>
         <translation type="obsolete">Impossível localizar a aplicação</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>Could not start the application </source>
         <translation type="obsolete">Impossível iniciar a aplicação</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Clique para fechar esta janela descartando as mudanças.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Clique para fechar esta janela.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Clique para fechar esta janela e salvar as mudanças.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Marque para que esta janela ocupe toda a área da tela.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco Rígido SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memória Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Cartão MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>executável citytime não encontrado</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>paraselecionar o fuso-horário,
 instale o aplicativo citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossível agendar alarme.
 Por Favor libere algum espaço e tente novamente</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 arquivos</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos os %1 arquivos</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos os arquivos</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index 5551969..6d11274 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -1,347 +1,374 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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>
+    <message>
+        <source>Welcome to Opie</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>FirstUseBackground</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>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>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>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contatos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sincronizando</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/security.ts b/i18n/pt_BR/security.ts
index fc5b0da..f863d1d 100644
--- a/i18n/pt_BR/security.ts
+++ b/i18n/pt_BR/security.ts
@@ -1,244 +1,228 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Any</source>
         <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar senha</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Senha incorreta</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entre a senha</translation>
     </message>
     <message>
         <source>Set passcode</source>
         <translation>Ajustar senha</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>A senha inserida está incorreta.
 Acesso negado</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Any</source>
         <translation type="obsolete">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished">Mudar a senha</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished">Ajustes</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished">Limpar a senha</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished">Requisitar senha ao ligar</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished">&lt;P&gt;A senha provê um nível mínimo de segurança quantra o acesso casual a este dispositivo.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (padrão)</translation>
     </message>
     <message>
         <source>Passcode</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>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/pt_BR/zsafe.ts b/i18n/pt_BR/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/pt_BR/zsafe.ts
+++ b/i18n/pt_BR/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ru/addressbook.ts b/i18n/ru/addressbook.ts
index f1202e9..8b9c297 100644
--- a/i18n/ru/addressbook.ts
+++ b/i18n/ru/addressbook.ts
@@ -1,1511 +1,1515 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Полное имя</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Выбрать</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Контакт</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Список</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Карта</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Поиск</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Начать поиск</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Закрыть</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Написать письмо</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Отправить</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Импорт vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Сведения обо мне</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Записать все</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Конфигурация</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Просмотр</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Тип файла правильный?</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Выбранный файл
 не имеет расширения &quot;.vcf&quot;.
 Вы действительно хотите открыть его?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Да</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Нет</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Добавить контакт?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Вы действительно хотите добавить контакт для
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Да для всех</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Не могу редактировать, синхронизируюсь</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Редактировать адрес</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Редактировать сведения обо мне</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Контакты - Сведения обо мне</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нет места</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Не могу записать информацию.
 Освободите место 
 и попробуйте снова.
 Все равно выйти? </translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Не найдено</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Не могу найти контакт для заданных условий поиска!</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Карточки</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Экспорт vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Вы выбрали контакт!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Вы должны задать имя файла !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Конфигурация</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Смешанное</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Настройки поиска</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Стиль запроса</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Исп. выражения</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Исп. шаблоны (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Чувств. к регистру</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Маленький</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормальный</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Большой</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Предпочитать Qt-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Предпочитать Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Замечание: QT-Mail предоставляется
 по умолчанию фирмой SHARP.
 Opie-Mail - свободная программа!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Порядок</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Выберите порядок контактов:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Выше</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Ниже</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Щелкните на  вкладке для выбора</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Установки очереди поиска</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Окно поиска ожидает регулярное выражение если выбрано</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Окно поиска только ожидает простые групповые символы</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Если выбрано, поиск различает большие и маленькие буквы</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Размер шрифта для списков и карточек</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Выбор шрифта для списков и карточек</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Использовать почтовый клиент SHARP, если есть</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Использовать почтовый клиент OPIE, если есть</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Переместить выбранный атрибут на строку вверх</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Переместить выбранный атрибут на строку вниз</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Список доступных атрибутов</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Все выбранные атрибуты из списка внизу в список вверху</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Удалить выбранный атрибут из верхнего списка</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Порядок (верх-низ) определяет первый контакт в списке</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Инстументы-/Меню</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Фиксированное</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Переключитесь в режим фиксированных меню/панелей после перезапуска приложения !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Перемещаемое</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Переключитесь в режим перемещаемых меню/панелей после перезапуска приложения !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Полное имя...</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Должность</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Организация</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Показать как</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Заметки...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Рабочий</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Домашний</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Город</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Обл.</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Индекс</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Страна</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>США</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Соединенное Королевство</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Албания</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Алжир</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Американское Самоа</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Андорра</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Ангола</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Ангулем</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Аргентина</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Аруба</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Австралия</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Австрия</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Азербайджан</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Багамы</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Бахрейн</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Бангладеш</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Барбадос</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Беларусь</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Бельгия</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Белиз</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Бенин</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Бермуды</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Бутан</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Ботсвана</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Остров Буве</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Бразилия</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Бруней-Даруссалам</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Болгария</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Буркина-Фасо</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Butundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Камбоджия</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Канада</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Зеленый Мыс</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Каймановы о-ва</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Чад</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Чили</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Китай</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Остров Рождества</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Колумбия</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Коморские о-ва</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Конго</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Острова Кука</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Коста Рика</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Берег Слоновой Кости</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Хорватия</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Куба</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Кипр</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Чехословакия</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Дания</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Джибути</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Доминика</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Доминиканская Республика</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Восточный Тимор</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Эквадор</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Египет</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>Сальвадор</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Экваториальная Гвинея</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Эритрея</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Эстония</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Эфиопия</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Фолклендские о-ва</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Фарерскиe о-ва</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Фиджи</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Финляндия</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Франция</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Французская Гвиана</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Французская Полинезия</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Габон</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Гамбия</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Грузия</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Германия</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Гибралтар</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Греция</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Гренландия</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Гренада</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Гуам</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Гватемала</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Гвинея</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Гайяна</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Гаити</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Ватикан</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Гондурас</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Гонконг</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Венгрия</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Исландия</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Индия</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Индонезия</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Ирландия</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Израиль</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Италия</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Япония</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Иордан</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Казахстан</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Кения</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Корея</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Кувейт</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Лаос</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Латвия</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Лебанон</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Лесото</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Либерия</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Лихтенштейн</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Литва</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Люксембург</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Макао</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Македония</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Мадагаскар</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Малави</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Малазия</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Мальдивы</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Мали</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Мальта</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Мартиника</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Мавритания</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Маврикий</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Майотте</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Мексика</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Микронезия</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Молдавия</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Монако</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Монголия</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Монсерат</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Марокко</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Мозамбик</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Мьянма</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Намибия</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Науру</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Непал</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Нидерланды</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Нов. Каледония</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Нов. Зеландия</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Никарагуа</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Нигер</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Нигерия</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Ниуэ</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Норвегия</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Оман</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Пакистан</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation> Палау</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Панама</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Папуа Новая Гвинея</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Парагвай</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Перу</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Филиппины</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Польша</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Португалия</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Пуэрто Рико</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Катар</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Реюньон</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Румыния</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Россия</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Руанда</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>С.-Люсия</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Самоа</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>Сан Марино</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Саудовская Аравия</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Сенегал</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Сейшельские</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Сьерра Лионе</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Сингапур</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Словакия</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Словения</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Соломоновы о-ва</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Сомали</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>ЮАР</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Испания</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Шри Ланка</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Св. Елены о-ва</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Судан</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Суринам</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Свазиленд</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Швеция</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Швейцария</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Тайвань</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Таджикистан</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Танзания</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Тайланд</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Того</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Токелау</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Тонга</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Тунис</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Турция</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Туркменистан</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Тувалу</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Уганда</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Украина</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Уругвай</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Узбекистан</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Вануату</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Венесуэла</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Виргинские о-ва</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Западная Сахара</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Йемен</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Югославия</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Замбия</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Зимбабве</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>День рождения</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годовщина</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жен</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Введите заметки</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Редактировать имя</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Отчество</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Фамилия</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суффикс</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Афганистан</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Антарктика</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Армения</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Боливия</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Камерун</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Гана</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Гваделупа</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Гвинея-Бисау</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Ямайка</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Кирибати</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Киргизстан</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Палестинские независимые территории</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Питкернские о-ва</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Вьетнам</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Нажать для ввода ФИО</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>Введите полное имя ! Если у вас фамилия из нескольких слов (например &quot;de la Guerra&quot;), пожалуйста введите &lt;lastname&gt;,&lt;firstnames&gt; таким образом:&quot;de la Guerra, Carlos Pedro&quot; </translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Работа...</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Что-нибудь типа &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Место работы контакта</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Нажать для выбора изменяемого атрибута</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Нажать для выбора, как записывать имя и как его показывать</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Раб. тел.</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Раб. факс</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Раб. моб.</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-mail по умолчанию</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-Mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Дом. тел.</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Дом. факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Дом. моб.</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Офис</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Профессия</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Помощник</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Управляющий</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Супруг(а)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">День рожд.</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Годовщина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Прозвище</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Дети</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Name Title</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Имя</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Отчество</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Фамилия</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Суффикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Файл</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Должность</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Отдел</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Компания</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Раб. улица</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Раб. город</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Раб. область</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Раб. индекс</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Страна(раб.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Раб. пейджер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Раб. WEB-страница</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Дом. ул.</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Дом. город</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Дом.обл.</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Дом.индекс</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Страна(дом)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Дом.WEB</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Заметки</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libqpe.ts b/i18n/ru/libqpe.ts
index 9c1888f..0e90a31 100644
--- a/i18n/ru/libqpe.ts
+++ b/i18n/ru/libqpe.ts
@@ -1,951 +1,1021 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(мульти)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Служебные</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Личные</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Мульти)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Новая категория</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Новая категория</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Категории</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Приложение</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Здесь находятся категории</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Глобальный</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Отметьте категории к которым относится документ.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Здесь введите новую категорию.  Нажмите &lt;b&gt;Добавить&lt;/b&gt; чтобы добавить её в список.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Введите новую категорию слева и нажмите чтобы добавить её в список.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Нажмите чтобы удалить выделенную категорию.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Отметьте чтобы это свойство было доступно всем приложениям.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Извините, другое приложение
 редактирует категории.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Изменить категории</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Показать январь выбранного года</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Показать предыдущий месяц</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Показать следующий месяц</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Показать декабрь выбранного года</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Закрыть Выбор Файла</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Показать документы этого типа</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Просмотр документа</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Показать документы в этой категории</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Нажмите чтобы выбрать документ из списка</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, или выберите&lt;b&gt;Новый документ&lt;/b&gt;  чтобы создать новый документ.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Нажмите и удерживайте чтобы увидеть свойства.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Строка не найдена.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Конец достигнут, продолжаю с начала</translation>
+        <translation type="obsolete">Конец достигнут, продолжаю с начала</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Что найти:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Начать поиск в:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Дек 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Учет регистра</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Искать в обратном направлении</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Просмотр документа</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Не удалось удалить файл.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Копия</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Сдублировать</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Не удалось скопировать файл.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Не удалось переместить документ.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Жесткий диск</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Комментарии:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Быстрый запуск (расходует память)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Отправить</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Тип устройства на котором находится документ.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Имя этого документа.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Загрузить это приложение чтобы оно было моментально доступно.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Удалить этот документ.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Сделать копию этого документа.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Отправить этот документ на другое устройство.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Использовать свое вращение</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Информация о владельце</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Введите пароль</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Нет</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Нет места</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Во время создания файла
 настроек для этой программы
 произошла ошибка.
 
 Пожалуйста освободите место и
 попробуйте снова.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Не могу создать загрузочные файлы
 Пожалуйста освоюодите место
 прежде чем вводить данные</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Не могу установить будильник.
 Пожалуйста освободите место и попробуйте снова.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>Д</translation>
+        <translation type="obsolete">Д</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>М</translation>
+        <translation type="obsolete">М</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>Г</translation>
     </message>
     <message>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месяц</translation>
     </message>
     <message>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Адреса Email:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Дом. телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Дом. Факс:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Дом. мобильный:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Дом. WEB-страница:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Раб. WEB-страница:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Офис:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Раб. телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Раб. факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Раб. мобильный:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Раб. пейджер:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Профессия:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Помощник:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Управляющий:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Муж</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Жен</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Пол:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Супруг(а):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>День рожд.:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Годовщина:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Прозвище:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Отчество</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Фамилия</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Суффикс</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Файл</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Должность</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Отдел</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Организация</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Раб. телефон</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Раб. факс</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Раб. мобильный</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email по умолчанию</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Дом. телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Дом. факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Дом. мобильный</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Раб. улица</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Раб. город</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Раб. область</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Раб. индекс</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Страна(раб.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Раб. пейджер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Раб. WEB-страница</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Профессия</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Помощник</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Управляющий</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Дом. улица</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Дом. город</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Дом. область</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Дом. индекс</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Страна(дом.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Дом. WEB-страница</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Супруг(а)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>День рожд.</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Годовщина</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Прозвище</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Дети</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Заметки</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Группы</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Новый документ</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Срд</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Чтв</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Нажмите чтобы закрыть это окно, не сохраняя.</translation>
+        <translation type="obsolete">Нажмите чтобы закрыть это окно, не сохраняя.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Нажмите чтобы закрыть это окно.</translation>
+        <translation type="obsolete">Нажмите чтобы закрыть это окно.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Нажмите чтобы закрыть это окно и сохранить изменения.</translation>
+        <translation type="obsolete">Нажмите чтобы закрыть это окно и сохранить изменения.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Нажмите чтобы сделать это окно перемещаемым.</translation>
+        <translation type="obsolete">Нажмите чтобы сделать это окно перемещаемым.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Нажмите чтобы это окно заняло все доступное место на экране.</translation>
+        <translation type="obsolete">Нажмите чтобы это окно заняло все доступное место на экране.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Подробная справка недоступна для этого приложения, но есть контекстная справка.&lt;p&gt;Как её использовать:&lt;p&gt;&lt;ol&gt;&lt;li&gt;нажмите и удерживайте кнопку справки.&lt;li&gt;когда заголовок окна покажет &lt;b&gt;Что это...&lt;/b&gt;, нажмите на любой контроль.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Что это...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Вы уверены что хотите удалить
 %1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation>Янв</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Мар</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Июнь</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Июль</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Сен</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Нояб</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">Д</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">М</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 документ</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Нажмите чтобы закрыть это окно, не сохраняя.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Нажмите чтобы закрыть это окно.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Нажмите чтобы закрыть это окно и сохранить изменения.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Нажмите чтобы это окно заняло все доступное место на экране.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF карта</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Жесткий диск</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD карта</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Жесткий диск</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Внутреннее хранилище</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Внутренняя память</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC карта</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>citytime программа не найдена</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Чтобы выбирать часовоые пояса,
 пожалуйста установите citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Нет места</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Не могу установить будильник.
 Пожалуйста освободите место и попробуйте снова</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 файлы</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Все %1 файлы</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Все файлы</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ru/qpe.ts b/i18n/ru/qpe.ts
index 8eed76b..8fee8aa 100644
--- a/i18n/ru/qpe.ts
+++ b/i18n/ru/qpe.ts
@@ -1,327 +1,386 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Время и Дата</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Персональная Информация</translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Проблема</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 не отвечает.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы хотите прервать работу программы?&lt;/p&gt;</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>&lt;qt&gt;&lt;p&gt;Быстрая загрузка запрещена для этой программы. Нажмите и удерживайте иконку программы, чтобы разрешить ее.&lt;/qt&gt;</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>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; прервано сигналом %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Программа прервана</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Программа не найдена</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Не могу найти программу &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Не могу найти программу %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
 </context>
 <context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Аккумулятор</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Аккумулятор разряжен</translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation>&lt;&lt; Предыд.</translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation>След. &gt;&gt;</translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Коснитесь экрана для продолжения.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Подождите, загружаю установки %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Подождите...</translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Завершено</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Юникод</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Запуск</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Запуск</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Нет программы</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt; Нет заданной программы для документа.&lt;p&gt; Тип %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Документы</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Просмотреть как текст</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Поиск Документов...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Пиктограммы</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Список</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>Document View</source>
         <translation>Просмотр</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Все типы</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>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Безопасный режим</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Управление плагинами...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Перезагрузить Otopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Помощь...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Информация</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>&lt;p&gt;Системная дата не похожа на правильную.
 (%1)&lt;/p&gt;&lt;p&gt;Скорректировать время?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Аккумулятор сел совсем!
+        <translation type="obsolete">Аккумулятор сел совсем!
 Выключите питание до тех пор,
 пока заряд не восстановится!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
-        <translation>Аккумулятор разряжен.</translation>
+        <translation type="obsolete">Аккумулятор разряжен.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>Запасной аккумулятор разряжен.
+        <translation type="obsolete">Запасной аккумулятор разряжен.
 Зарядите запасной аккумулятор.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Бизнес-карта</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Безопасный Режим</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>&lt;P&gt;Ошибка при старте системы, система переведена в Безопасный Режим. Плагины не будут загружены. Используйте Управление Плагинами, чтобы запретить вызвавший системную ошибку.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Управление Плагинами...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Статус памяти</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Нехватка памяти.
 Сохраните данные!</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Критическая нехватка памяти.
 Немедленно завершите программу.</translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Завершить сеанс</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Выйти из Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Перезагрузить</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Перезагрузить Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Выключить</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Функции завершения сеанса предназначены для разработки и тестирования Opie. При нормальной работе эти функции не нужны.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Завершить сеанс...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Запрос на синхронизацию</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Неавторизованная система требует доступа к устройству.&lt;p&gt;Если у Вас Qtopia Desktop 1.5.1 и меньше, пожалуйста обновите его.</translation>
+        <translation type="obsolete">&lt;p&gt;Неавторизованная система требует доступа к устройству.&lt;p&gt;Если у Вас Qtopia Desktop 1.5.1 и меньше, пожалуйста обновите его.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Запретить</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Неизвестная система требует доступа к устройству.&lt;p&gt;Если Вы только что первый раз запустили синхронизатор, то это нормально.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Разрешить</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>
+    <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>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation>Прервать</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Синхронизация:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/security.ts b/i18n/ru/security.ts
index 8afdbaa..8ed99e4 100644
--- a/i18n/ru/security.ts
+++ b/i18n/ru/security.ts
@@ -1,260 +1,268 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Уст. пароль</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Изменить пароль</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Введите пароль</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Неверный пароль</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Введеный пароль неверен.
 Доступ запрещен</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Любой</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ни одного</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Введите новый пароль</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Введите пароль еще раз</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Внимание</translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation>&lt;p&gt;Все заданные пользователем участки будут потеряны.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation>192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation>1.0.0.0/8</translation>
     </message>
     <message>
         <source>WARNING</source>
-        <translation>ВНИМАНИЕ</translation>
+        <translation type="obsolete">ВНИМАНИЕ</translation>
     </message>
     <message>
         <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation>&lt;p&gt;Выбор IntelliSync запретит пароль FTP.&lt;p&gt;Любая машина в заданном участке сможет синхронизироваться с вашим КПК!</translation>
+        <translation type="obsolete">&lt;p&gt;Выбор IntelliSync запретит пароль FTP.&lt;p&gt;Любая машина в заданном участке сможет синхронизироваться с вашим КПК!</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Настройки безопасности</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Изменить пароль</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Сбросить пароль</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Требовать пароль при включении</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Синхр.</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Принимать запросы из сети:</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Пароль предоставляет минимальный уровень защиты от случайного доступа к устройству.</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Войти</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Входить автоматически</translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation>Эта кнопка позволит вам изменить пароль.  
 
 Заметьте: это НЕ пароль для синхронизации.</translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation>Удалить текущий пароль.  
 Вы всегда сможете ввести новый.</translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation>Если вы разрешите эту опцию, нужно будет вводить пароль при каждом включении КПК.</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>Если вы выберите эту опцию, opie-login автоматически войдет в систему под выбранным из списка пользователем.  
 
 На Zaurus 5x00 это всегда пользователь &quot;root&quot;.</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>Этот список позволит выбрать пользователя для авто-входа
 (если разрешен).  
 
 Вы можете выбрать только уже настроенное имя пользователя.</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>Выберите или введите новый участок сети.  
 
 Этот список позволяет выбрать участок сети из которого можно подключится к вашему КПК.  
 
 Например, участок сети 192.168.1.0/24 позволит любой машине с IP между 192.168.1.1 и 192.168.1.254 подключаться к (и синхронизироваться с) вашим КПК.  
 
 Запись &quot;Все&quot; позволит подключиться *любому* IP. 
 Запись &quot;Ни одного&quot; *запретит* все соединения.  
 
 Если неуверены, выберите &quot;Все&quot;.</translation>
     </message>
     <message>
         <source>Delete Entry</source>
         <translation>Удалить запись</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>Удалить выбранный участок из списка
 
 Если вы нажмете эту кнопку, выбранный участок будет удален из списка.
 
 Если вы нажали эту кнопку случайно, кнопка &quot;По умолчанию&quot;
 восстановит список в том виде, когда вы первый раз запустили ваш КПК.</translation>
     </message>
     <message>
         <source>Restore Defaults</source>
         <translation>По умолчанию</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>Эта кнопка восстановит список участков сети
 по умолчанию.
 
 Учтите что вручную введенные участки будут потеряны!</translation>
     </message>
     <message>
         <source>Select your sync software</source>
         <translation>Выберите программу</translation>
     </message>
     <message>
         <source>QTopia</source>
-        <translation>QTopia</translation>
+        <translation type="obsolete">QTopia</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation>IntelliSync</translation>
     </message>
     <message>
         <source>This option changes the login behaviour of the internal FTP server.  
 
 If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
 
 The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
-        <translation>Эта опция изменяет поведение внутреннего FTP сервера.  
+        <translation type="obsolete">Эта опция изменяет поведение внутреннего FTP сервера.  
 
 Если есть проблемы с соединением, попробуйте значение &quot;IntelliSync&quot;, с которым будет приниматься любое соединение по FTP порту.
 
 Значение по умолчанию - Qtopia. Оно позволит соединяться с именем &quot;root&quot; и паролем &quot;Qtopia&quot;.   Пароль чувствителен к РеГиСтРу.</translation>
     </message>
     <message>
         <source>Qtopia 1.7</source>
         <translation>Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation>Opie 1.0</translation>
     </message>
     <message>
         <source>Both</source>
-        <translation>Оба</translation>
+        <translation type="obsolete">Оба</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/ru/zsafe.ts b/i18n/ru/zsafe.ts
index 73b4adc..192d098 100644
--- a/i18n/ru/zsafe.ts
+++ b/i18n/ru/zsafe.ts
@@ -1,635 +1,869 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation>ZСейф</translation>
+        <translation type="obsolete">ZСейф</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Вы хотите удалить?</translation>
+        <translation type="obsolete">Вы хотите удалить?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation>&amp;Удалить</translation>
+        <translation type="obsolete">&amp;Удалить</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Не удалять</translation>
+        <translation type="obsolete">&amp;Не удалять</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Правка записи</translation>
+        <translation type="obsolete">Правка записи</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation>Имя</translation>
+        <translation type="obsolete">Имя</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Имя пользователя</translation>
+        <translation type="obsolete">Имя пользователя</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Пароль</translation>
+        <translation type="obsolete">Пароль</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation>Примечания</translation>
+        <translation type="obsolete">Примечания</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation>Поле 4</translation>
+        <translation type="obsolete">Поле 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation>Поле 5</translation>
+        <translation type="obsolete">Поле 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Новая запись</translation>
+        <translation type="obsolete">Новая запись</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Имя записи должно отличаться
+        <translation type="obsolete">Имя записи должно отличаться
 от имени категории.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Поиск</translation>
+        <translation type="obsolete">Поиск</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Запись не найдена</translation>
+        <translation type="obsolete">Запись не найдена</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Да</translation>
+        <translation type="obsolete">&amp;Да</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation>Поле 2</translation>
+        <translation type="obsolete">Поле 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation>Поле 3</translation>
+        <translation type="obsolete">Поле 3</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Все</translation>
+        <translation type="obsolete">Все</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Текст</translation>
+        <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Remove text file</source>
-        <translation>Убрать текстовый файл</translation>
+        <translation type="obsolete">Убрать текстовый файл</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Не смог убрать текстовый файл.</translation>
+        <translation type="obsolete">Не смог убрать текстовый файл.</translation>
     </message>
     <message>
         <source>No document defined.
 You have to create a new document</source>
-        <translation>Документы не заданы.
+        <translation type="obsolete">Документы не заданы.
 Вы должны создать новый документ</translation>
     </message>
     <message>
         <source>Export text file</source>
-        <translation>Экспорт в текст файл</translation>
+        <translation type="obsolete">Экспорт в текст файл</translation>
     </message>
     <message>
         <source>Import text file</source>
-        <translation>Импорт из текст файла</translation>
+        <translation type="obsolete">Импорт из текст файла</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Не смог экспортировать в текст файл.</translation>
+        <translation type="obsolete">Не смог экспортировать в текст файл.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Не смог импортировать из текст файла.</translation>
+        <translation type="obsolete">Не смог импортировать из текст файла.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Введите пароль</translation>
+        <translation type="obsolete">Введите пароль</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Неверный пароль.
+        <translation type="obsolete">Неверный пароль.
 
 ZСейф будет закрыт.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Неверный пароль.
+        <translation type="obsolete">Неверный пароль.
 Попробовать снова?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Да</translation>
+        <translation type="obsolete">&amp;Да</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Нет.</translation>
+        <translation type="obsolete">&amp;Нет.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Пустой документ или
+        <translation type="obsolete">Пустой документ или
 неверный пароль.
 Продолжить?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;нет</translation>
+        <translation type="obsolete">&amp;нет</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Да.</translation>
+        <translation type="obsolete">&amp;Да.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Пароль пуст.
+        <translation type="obsolete">Пароль пуст.
 Пожалуйста введите снова.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Введите пароль снова</translation>
+        <translation type="obsolete">Введите пароль снова</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Пароли должны быть одинаковыми.
+        <translation type="obsolete">Пароли должны быть одинаковыми.
 Пожалуйста введите снова.</translation>
     </message>
     <message>
         <source>Do you want to save </source>
-        <translation>Вы хотите сохранить</translation>
+        <translation type="obsolete">Вы хотите сохранить</translation>
     </message>
     <message>
         <source>
 before continuing?</source>
-        <translation>
+        <translation type="obsolete">
 прежде чем продолжать?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Сохранить</translation>
+        <translation type="obsolete">&amp;Сохранить</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Не сохранять</translation>
+        <translation type="obsolete">&amp;Не сохранять</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Файл паролей сохранен.</translation>
+        <translation type="obsolete">Файл паролей сохранен.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Вы хотите сохранить
+        <translation type="obsolete">Вы хотите сохранить
 перед выходом?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>С&amp;охранить
+        <translation type="obsolete">С&amp;охранить
 с новым
 паролем</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Категория</translation>
+        <translation type="obsolete">Категория</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Диалог ожидания</translation>
+        <translation type="obsolete">Диалог ожидания</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Собираю пиктограммы...</translation>
+        <translation type="obsolete">Собираю пиктограммы...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Создать новый документ ZСейф</translation>
+        <translation type="obsolete">Создать новый документ ZСейф</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
-        <translation>Теперь вы должны дважды
+        <translation type="obsolete">Теперь вы должны дважды
 ввести пароль для только
 что созданного документа.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Открыть документ ZСейф</translation>
+        <translation type="obsolete">Открыть документ ZСейф</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Сохранить документ ZСейф как..</translation>
+        <translation type="obsolete">Сохранить документ ZСейф как..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Менеджер Паролей&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Менеджер Паролей&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation>ZСейф версии 2.1.2-jv01b&lt;br&gt;</translation>
+        <translation type="obsolete">ZСейф версии 2.1.2-jv01b&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>написан Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">написан Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Перевод Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Перевод Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation>ZСейф версии 2.1.2&lt;br&gt;</translation>
+        <translation type="obsolete">ZСейф версии 2.1.2&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Пиктограмма</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Поле 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Поле 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Поле 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Поле 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Поле 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Информация:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Новая запись</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Поле 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZСейф</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>ФайлДлг</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>фильтр типов файлов</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation>КомбоСписок ФайлТипФильтр
 
 правка или выбор фильтра</translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation>подтверждает выбор и закрывает форму</translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation>Кнопка &quot;Да&quot;</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation>отменяет выбор и закрывает форму</translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation>Кнопка &quot;Отмена&quot;</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation>показывает выбранное имя файла</translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation>Правка имен файлов
 
 показывает выбранный файл
 и позволяет на лету изменить
 имя файла</translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation>КомбоСписок Каталогов
 
 правка или выбор каталогов</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>size</source>
         <translation>размер</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Тип</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>каталоги в виде списка</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation>Каталоги в виде списка
 
 показывает список каталогов и файлов</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation>папка</translation>
     </message>
     <message>
         <source>file</source>
         <translation>файл</translation>
     </message>
     <message>
         <source>link</source>
         <translation>ссылка</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Пожалуйста подождите...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZСейф</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Не могу создать каталог
 %1
 
 ZСейф будет закрыт.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Сохранить документ</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>С&amp;охранить документ с новым паролем</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>&amp;Экспорт текст файла</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>&amp;Импорт текст файла</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>&amp;Удалить текст файл</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>О&amp;ткрывать записи в раскрытом виде</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>В&amp;ыйти</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Новый</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Категория</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Вырезать</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Копировать</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Вставить</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Поиск</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Запись</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;О программе</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>С&amp;правка</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Поле 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Поле 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Примечания</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Поле 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Поле 5</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Новый документ</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>О&amp;ткрыть документ</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Сохранить документ как ..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation>Не могу создать каталог
 ...//Documents/application
 
 ZСейф будет закрыт.</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation>Не могу создать каталог
 ...//Documents/application/zsafe
 
 ZСейф будет закрыт.</translation>
     </message>
     <message>
         <source>New entry</source>
         <translation>Новая запись</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Правка категории или записи</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Удалить категорию или запись</translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation>Поиск записи</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Вы хотите удалить?</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Не удалять</translation>
+    </message>
+    <message>
+        <source>Edit Entry</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>New Entry</source>
+        <translation type="unfinished">Новая запись</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Имя записи должно отличаться
+от имени категории.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Поиск</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Запись не найдена</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Да</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished">Все</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished">Текст</translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished">Убрать текстовый файл</translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Не смог убрать текстовый файл.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished">Документы не заданы.
+Вы должны создать новый документ</translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished">Экспорт в текст файл</translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished">Импорт из текст файла</translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Не смог экспортировать в текст файл.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Не смог импортировать из текст файла.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Введите пароль</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Неверный пароль.
+
+ZСейф будет закрыт.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Неверный пароль.
+Попробовать снова?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Да</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Нет.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Пустой документ или
+неверный пароль.
+Продолжить?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;нет</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Да.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Пароль пуст.
+Пожалуйста введите снова.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Введите пароль снова</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Пароли должны быть одинаковыми.
+Пожалуйста введите снова.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished">Вы хотите сохранить</translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished">
+прежде чем продолжать?</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Сохранить</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Не сохранять</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Файл паролей сохранен.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Вы хотите сохранить
+перед выходом?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">С&amp;охранить
+с новым
+паролем</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Категория</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Диалог ожидания</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Собираю пиктограммы...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Создать новый документ ZСейф</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished">Теперь вы должны дважды
+ввести пароль для только
+что созданного документа.</translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Открыть документ ZСейф</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Сохранить документ ZСейф как..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Менеджер Паролей&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished">ZСейф версии 2.1.2-jv01b&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">написан Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Перевод Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished">ZСейф версии 2.1.2&lt;br&gt;</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index 65d1973..6e98c77 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -1,1514 +1,1518 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Polno ime</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Izberi</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Pošlji epošto</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Prežarči vnos</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urejati podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Uredi moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Uredi naslov</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Stiki - Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Ne morem shraniti informacije.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Uvozi vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zapri iskalnik</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Shrani vse podatke</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Natavitve</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Ne najdem</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Seznam</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Kartice</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Kartica</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Začni iskanje</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Pravi tip datoteke?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Da</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Ne</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Ne najdem stika za
 iskani vzorec!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Izbrana datoteka
 nima končnice &quot;.vcf&quot;.
 Ali jo res želite odpreti?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Dodam stik?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Ali res želite dodati stik za 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Vse da</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Izvozi vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Morate izbrati stik!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Morate nastaviti ime datoteke !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Stil poizvedbe</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Uporabi regularne izraze</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Uporabi (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Loči male in velike črke</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Raje QT-Pošta</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Raje Opie-Pošta</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Obvestilo: QT-Pošta je
 že naložena v SHARP-ovem
 privzetem ROM-u. Opie-Pošta
 je zastonj!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Razno</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Nastavitve iskalnika</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Mala</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velika</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Red</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Izberite red stikov:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Kliknite na zavihek, da izberete</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Nastavitve za stil iskalne poizvedbe</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Iskalnik pričakuje regularne izraze, če so ti izbrani</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Iskalnik pričakuje enostavne zvezdice</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Če izbrano, iskalnik razlikuje med velikimi in malimi črkami</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Velikost pisave za seznam- in kartični pogled</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Nastavitve pisave za seznam in kartični pregled</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Uporabi Sharpov poštni program, če je navoljo</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Uporabi OPIE pošto že je naložena</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Premakni izbrani parameter eno vrstico gor</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Premakni izbrani parameter eno vrstico dol</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Seznam vseh dostopnih parametrov</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Dodaj izbrani parameter iz seznama spodaj v gornji seznam</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Odstrani izbrani parameter iz gornjega seznama</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Red (gor -&gt; dol) definira prvi stik prikazan v naslednjem stolpcu seznama</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Orodna-/Menujska vrstica</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Popravljeno</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Preklopi na stalno orodno-/menujsko vrstico, ko se program ponovno zažene !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobilno</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Preklopi na mobilno orodno-/menujsko vrstico, ko se program ponovno zaženo !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Delovno mesto</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Mesto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Pokrajina</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Država</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Polno ime...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Zapiski...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Službeno</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Naslov</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Poštna številka</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Združene države</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Velika Britanija</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japonska</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francija</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Nemčija</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norveška</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženski</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Vpišite zapiske</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Uredi ime</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanija</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Alžirija</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Ameriška Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andora</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Avstralija</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Avstrija</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahami</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladeš</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belorusija</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgija</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudi</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvetski otoki</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brazilija</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarija</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkini Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodža</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Kajmanovi otoki</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Čad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Čile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Kitajska</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Božični otok</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Kulumbija</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Kongo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Kukovi otoki</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Kosta Rika</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Cote d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Hrvaška</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Kuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Ciper</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Češka</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Danska</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikanska republika</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Vzhodni Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ekvador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipt</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Ekvatorialna Gvineja</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Ertireja</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonija</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopija</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falklandski otoki</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Faroeski otoki</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fidži</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finska</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Francoska Gvineja</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Francoska Polinezija</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambija</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Džordžija </translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grčija</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grenlandija</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Gvatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Gvineja</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Gujana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Madžarska</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islandija</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indija</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonezija</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irska</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Izrael</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italija</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordan</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenija</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Koreja</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvija</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lestoša</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberija</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lithuana</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luksemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Makedonija</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malezija</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldivi</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mehika</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronezija</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monako</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolija</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Maroko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambik</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibija</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Nizozemska</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nova Kaledonija</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nova Zelandija</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nikaragva</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigerija</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papva Nova Gvineja</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paragvaj</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipini</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polska</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugalska</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Riko</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qutar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Romunija</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusija</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Sveta Lucija</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Savdska Arabija</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Sečili</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Siera Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovaška</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenija</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Salamonovi Otoki</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalija</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Južna Afrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Španija</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Šri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Sveta  Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Švedska</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Švica</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Tajvan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadžikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzanija</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tajska</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunizija</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turčija</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukrajina</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Urugvaj</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Deviški Otoki</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Zahodna Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavija</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambija</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabve</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuvajt</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznan</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afganistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antartika</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenija</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivija</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kamerun</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Gana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamajka</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestinian Sovereign Areas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Islands</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pritisnite, da vpišete priimek- in ime</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>Vpišite celo ime direktno! Če imate več priimkov (primer: &quot;Božič Novak&quot; ), prosimo vpišite &lt;priimek&gt;,&lt;ime&gt; kot to: &quot;Božič Novak, Jože&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Naziv delovnega mesta..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Nekaj kot &quot;ml.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Delovno mesto stika</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pritisnite, da izberete parameter, ki bi ga radi spremenili</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pristisnite, da izberete kako shraniti ime (in kako ga prikazati v seznamu)</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Službeni telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Službeni faks</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Službeni mobitel</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Privzeta epošta</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Epošta</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Domači telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Domači faks</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Domači mobitel</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Pisarna</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Poklic</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Pomočnik</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Upravnik</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Zakonec</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Spol</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Otroci</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Datoteka kot</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">Delovno mesto</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Oddelek</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Podjetje</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Ulica podjetja</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Mesto podjetja</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Okrožje podjetja</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Poštna št. podjetja</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Država podjetja</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Službeni pozivnik</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Službena spletna stran</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Domača ulica</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Domače mesto</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Domače okrožje</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Domača poštna številka</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Domača država</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Domača spletna stran</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Zapiski</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index 2dc2495..08bb433 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -1,994 +1,1045 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(več.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Poslovno</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Osebno</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Več.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova kategorija</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova kategorija</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Uredi kategorijo</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorije</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplikacija</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorije gredo sem</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globalno</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Obkljukajte kategorije katerim ta dokument pripada.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Tu vnesite novo kategorijo. Pritisnite &lt;b&gt;Dodaj&lt;/b&gt;, da dodate v seznam.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Vnesite novo kategorijo levo in pritisnite dodaj, da dodate v seznam.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pritisnite, da izbrišete osvetljeno kategorijo.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Obkljukajte, da naredite to lastnost dostopno vsem programom.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Oprostite, že neka druga aplikacija
 ureja kategorije.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Uredi kategorije</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Prikaži januar v izbranem letu</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Prikaži prejšni mesec</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Prikaži naslednji mesec</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Prikaži december v izbranem letu</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Zapri Izbiralca datotek</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Prikaži dokumente tega tipa</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Pogled dokumenta</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Prikaži dokumente v tej kategoriji</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Obkljukajte, da izberete dokument iz seznama</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>ali pa izberite &lt;b&gt;Nov dokument&lt;/b&gt;, da ustvarite nov dokument.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Kliknite in zadržite za lastnosti dokumenta.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Niz ni najden.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>Prišel na konec, začenjam na začetku</translation>
+        <translation type="obsolete">Prišel na konec, začenjam na začetku</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Najdi kaj:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Začni iskati:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Loči velike in male črke</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Išči nazaj</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Pogled dokumenta</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Izbris datoteke spodletel.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopija</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Kopiranje datoteke spodletelo.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Premikanje dokumenta spodletelo.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentar:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Hitro nalaganje (vzame nekaj spomin)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Medij na katerem je dokument.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Ime tega dokumenta.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Prednaloži ta program tako, da je takoj na voljo.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Izbriši ta dokument.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Naredi kopijo tega dokumenta.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Prežarči ta dokument na drugo napravo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Uporabi prilagojen zasuk</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informacije o lastniku</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpiši geslo</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Prišlo je do problema pri ustvarjenju
 nastavitvene informacije
 za ta program.
 
 Prosim sprostite nekaj prostora in
 poizkusite ponovno.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Ne morem ustvariti zagonskih datotek
 Prosim sprostite nekaj prostora
 preden vnašate podatke</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Ne morem izvršiti alarma.
 Sprostite nekaj spomina in poizkusite ponovno.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>L</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dan</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mesec</translation>
     </message>
     <message>
         <source>year</source>
         <translation>leto</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">Ste prepričani, da želite izbrisati
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Delovni naslov&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Domači naslov:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Epoštni naslovi: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Domači telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Domači faks: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Domači mobitel: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Domača spletna stran: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Službena spletna stran: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Pisarna: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Službeni telefon: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Službeni faks: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Službeni mobitel: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Službeni pager: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Poklic: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Pomočnik: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Upravnik: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženska</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Spol: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Sopotnik: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Rojstni dan: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Obletnica: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Vzdevek: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Imenski naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Naziv službenega mesta</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Oddelek</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Podjetje</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Službeni telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Službeni faks</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Službeni mobitel</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Privzeta Epošta</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Epošta</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Domači telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Domači faks</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Domači mobitel</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulica službe</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Mesto službe</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Okrožje službe</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Službena poštna številka</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Država službe</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Službeni pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Službena spletna stran</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Poklic</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Pomočnik</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Upravnik</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Domač naslov</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Domče mesto</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Domače okrožje</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Domača poštna številka</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Domača država</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domača spletna stran</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Sopotnik</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Otroci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupine</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nov dokument</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished">Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
+        <translation type="obsolete">Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation type="unfinished">Kliknite tu, da zaprete to okno.</translation>
+        <translation type="obsolete">Kliknite tu, da zaprete to okno.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished">Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
+        <translation type="obsolete">Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation type="unfinished">Kliknite tu, da naredite to okno premično.</translation>
+        <translation type="obsolete">Kliknite tu, da naredite to okno premično.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished">Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
+        <translation type="obsolete">Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished">&lt;Qt&gt;Pomoč ni na voljo za ta program, ima pa majhno pomol.&lt;p&gt;Da bi to uporabili:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknite in zadržite gumb za pomoč.&lt;li&gt;kose prikaže naslovna vrstica &lt;b&gt;Kaj je to...&lt;/b&gt;, kliknite na katerokoli od kontrol.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished">Kaj je to...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">Napaka</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokument</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="obsolete">&lt;Qt&gt;Pomoč ni na voljo za ta program, ima pa majhno pomol.&lt;p&gt;Da bi to uporabili:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknite in zadržite gumb za pomoč.&lt;li&gt;kose prikaže naslovna vrstica &lt;b&gt;Kaj je to...&lt;/b&gt;, kliknite na katerokoli od kontrol.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="obsolete">Kaj je to...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
+        <translation type="unfinished">Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation type="obsolete">Kliknite tu, da zaprete to okno.</translation>
+        <translation type="unfinished">Kliknite tu, da zaprete to okno.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
+        <translation type="unfinished">Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="obsolete">Kliknite tu, da naredite to okno premično.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
+        <translation type="unfinished">Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kartica</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kartica</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI trdi disk</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Notranja shramba</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Notranji spomin</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC kartica</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>program citytime ni najden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Če želite izbrati časovni pas,
 prosim naložite citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Ne morem izvršiti alarma.
 Prosim sprostite malo prostora in poizkusite ponovno</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 datotek</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Vseh %1 datotek</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Vse datoteke</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index c9e4524..0731ad0 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -1,346 +1,373 @@
 <!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>
+    <message>
+        <source>Welcome to Opie</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>FirstUseBackground</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>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>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>Syncing</source>
         <translation type="obsolete">Sinhroniziram</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Kontakti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Prekliči</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/security.ts b/i18n/sl/security.ts
index 86db9bd..1c23c6b 100644
--- a/i18n/sl/security.ts
+++ b/i18n/sl/security.ts
@@ -1,263 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Nastavi kodo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpišite kodo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koda ni pravilna</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Vpisana koda ni pravilna.
 Dostop zavrnjen</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Varnostne nastavitve</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Zbriši kodo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Potrebna koda pri vklopu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sinhroniziraj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sperjmi sinhronizacijo iz mreže:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">brez</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Koda prinaša minimalno zaščito za varovanje vaše naprave.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (privzeto)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</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>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/sl/zsafe.ts b/i18n/sl/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/sl/zsafe.ts
+++ b/i18n/sl/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/addressbook.ts b/i18n/xx/addressbook.ts
index 8ff596c..d274dfe 100644
--- a/i18n/xx/addressbook.ts
+++ b/i18n/xx/addressbook.ts
@@ -1,1503 +1,1507 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>China</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>France</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>India</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libqpe.ts b/i18n/xx/libqpe.ts
index 650834e..87b3eca 100644
--- a/i18n/xx/libqpe.ts
+++ b/i18n/xx/libqpe.ts
@@ -1,948 +1,1018 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>3</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>6</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">FOO</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">FOO</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>FOO</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index a462097..298efdb 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -1,510 +1,525 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocTab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FirstUse</name>
     <message>
         <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FirstUseBackground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">FOO</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>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/security.ts b/i18n/xx/security.ts
index 8673d95..9f0f8fd 100644
--- a/i18n/xx/security.ts
+++ b/i18n/xx/security.ts
@@ -1,262 +1,246 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">FOO {192.168.129.0/24?}</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">FOO</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Passcode</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>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <source>Alter the Sync Protocol to tweak for the different devices.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/zsafe.ts b/i18n/xx/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/xx/zsafe.ts
+++ b/i18n/xx/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/addressbook.ts b/i18n/zh_CN/addressbook.ts
index 13a7cdc..ac13c74 100644
--- a/i18n/zh_CN/addressbook.ts
+++ b/i18n/zh_CN/addressbook.ts
@@ -1,1336 +1,1340 @@
 <!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>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close 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>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>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</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>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</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>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</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>Not Found</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>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <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>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</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>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>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</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>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>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</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</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</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</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>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</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>File As</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>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>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</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>Afghanistan</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>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</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>Bolivia</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>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</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>France</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>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</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>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</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>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</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>Norway</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>Palestinian Sovereign Areas</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>Pitcairn Islands</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>Vietnam</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>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</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>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>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libqpe.ts b/i18n/zh_CN/libqpe.ts
index a84a335..41353fc 100644
--- a/i18n/zh_CN/libqpe.ts
+++ b/i18n/zh_CN/libqpe.ts
@@ -1,939 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</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>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </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>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>Nickname: </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>Groups</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/security.ts b/i18n/zh_CN/security.ts
index d60f914..1530ddb 100644
--- a/i18n/zh_CN/security.ts
+++ b/i18n/zh_CN/security.ts
@@ -1,230 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</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>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/zh_CN/zsafe.ts b/i18n/zh_CN/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/zh_CN/zsafe.ts
+++ b/i18n/zh_CN/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 507554e..497b27c 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -1,1506 +1,1510 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>全名</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>選取</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>New</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>搜尋</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>寫電郵給</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>傳送項目</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>個人資料</translation>
     </message>
     <message>
         <source>View</source>
         <translation></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>編輯個人資料</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>編輯地址</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>聯絡人 - 個人資料&quot;</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>儲存空間不足</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>無法儲存資料
 請先釋放些儲存空間後再試一次
 退出?
 </translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>輸入 cVard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>關閉搜尋</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>儲存所有資料</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>設定</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>未找到</translation>
     </message>
     <message>
         <source>List</source>
         <translation>列出</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>名片</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>名片</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>開始搜尋</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>是正確檔案類型嘛?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;是</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;否</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>無法找到此型態的聯絡人</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>選擇的檔案不是以&quot;.vcf&quot;結束.確定要開啟?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>新增聯絡人?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>確定要在%1加入聯絡人?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;全部都是</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>查詢樣式</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>使用一般的表達方式</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>使用萬用字元(*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>大小寫不同</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>郵件</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>採用QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>採用Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>注意: QT-Maily僅在Sharp的預設ROM中提供.Opie-Mail可免費安裝 </translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>搜尋之設定</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>小</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>一般</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>大</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>順序</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>選擇聯絡人順序</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>上移</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>下移</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>增加</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>設定</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>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>
     <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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>名</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>中名</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>姓</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>歸檔為</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>性別</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>職稱</translation>
     </message>
     <message>
         <source>City</source>
         <translation>城市</translation>
     </message>
     <message>
         <source>State</source>
         <translation>州</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>國家</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>全名...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>組織</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>類別</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>註解...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>商務</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>住家</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>住址</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>郵遞區號</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>美國</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>英國</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>日本</translation>
     </message>
     <message>
         <source>France</source>
         <translation>法國</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>德國</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>挪威</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>加拿大</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>男性</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>女性</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>細項</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>輸入註解</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>編輯姓名</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>阿爾巴尼亞</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>阿爾及利亞</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>美屬薩摩亞</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>安道爾共和國</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>安哥拉</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>安圭拉島</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>阿根廷</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>澳洲</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>奧地利</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>亞塞拜然</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>巴哈馬</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>巴林</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>孟加拉共和國</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>巴貝多</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>比利時人</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>比利時</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>貝里斯</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>貝南</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>百慕達(群島)</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>不丹</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>波紮那</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Island</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>巴西</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>文萊&gt;</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>保加利亞</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>布基那法索國</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>蒲隆地</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>柬埔寨</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>開普</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>卡宴</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>查德</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>智利</translation>
     </message>
     <message>
         <source>China</source>
         <translation>中國大陸</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Chrismas Island</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>歌倫比亞</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>科摩洛</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>剛果</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Island</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>哥斯大黎加</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>科都努</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>克羅埃西亞共和國</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>古巴</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>塞普勒斯</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>捷克</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>丹麥</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>吉布地</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>多米尼克</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>多明尼加共和國</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>East Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>厄瓜多爾</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>埃及</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>薩爾瓦多</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>赤道幾內亞</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>厄立特里亞</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>愛沙尼亞</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>衣索比亞</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>(英屬)福克蘭群島</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>法羅群島</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>斐濟</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>芬蘭</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>法屬圭亞那</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>玻里尼西亞</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>加彭</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>甘比亞</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>喬治亞</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>直布羅陀</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>希臘</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>格林蘭島</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>格瑞納達</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>關島</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>瓜地馬拉</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>幾內亞</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>蓋亞那</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>海地</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>羅馬教廷</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>宏都拉斯</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>香港</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>匈牙利</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>冰島</translation>
     </message>
     <message>
         <source>India</source>
         <translation>印度</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>印尼</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>愛爾蘭</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>以色列</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>義大利</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>約旦</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>哈薩克</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>肯亞</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>韓國</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>寮國</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>拉脫維亞</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>黎巴嫩</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>賴索托</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation> 賴比瑞亞</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>列支敦斯登</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>立陶宛</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>盧森堡</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>澳門</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>馬其頓</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>馬達加斯加</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>馬拉威</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>馬來西亞</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>馬爾地夫</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>馬利</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>馬爾他</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>馬丁尼克</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>茅利塔尼亞</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>模里西斯</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>馬優特</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>墨西哥</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>密克羅西尼亞</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>摩爾達維亞</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>摩納哥</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>蒙古</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>蒙特色拉特</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>摩洛哥</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>莫三比克</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>緬甸</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>那米比亞</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>諾魯</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>尼泊爾</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>荷蘭</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>新加勒多尼亞</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>紐西蘭</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>尼加拉瓜</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>尼日</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>奈及利亞</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>阿曼</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>巴基斯坦</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>巴拿馬</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>巴布亞島新幾內亞島</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>巴拉圭</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>祕魯</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>菲律賓</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>波蘭</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>葡萄牙</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>波多黎各</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>卡達</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>留尼旺島</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>羅馬尼亞</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>俄羅斯</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>盧安達</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>聖路西亞</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>薩摩亞</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>聖馬利諾</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>沙烏地阿拉伯</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>塞內加爾</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>塞席爾群島</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>獅子山</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>新加坡</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>斯洛伐克</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>斯洛維尼亞共和國</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>所羅門群島</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>索馬利亞</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>南非</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>西班牙</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>斯里蘭卡</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>聖海倫娜</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>蘇丹</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>蘇利南莫河</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>史瓦濟蘭</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>瑞典</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>瑞士</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>臺灣</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>塔吉克</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>坦尚尼亞</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>泰國</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>多哥</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>東加</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>突尼西亞</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>土耳其</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>土庫曼</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>吐瓦魯</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>烏干達</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>烏克蘭</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>烏拉圭</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>烏茲別克斯坦</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>萬那杜</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>委內瑞拉</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>維京群島</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>西撒阿拉</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>葉門</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>南斯拉夫</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>尚比亞</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>辛巴威</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>週年紀念日</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>科威特</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</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>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></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">公司電話號碼</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">公司傳真號碼</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">公司手機號碼</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">預設電郵地址</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">電子郵件</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">住家電話號碼</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">住家傳真號碼</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">私人手機號碼</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">公司</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">職業</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">助理</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">經理</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">配偶</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">性別</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="obsolete">生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="obsolete">週年紀念日</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">綽號</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">子女</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">名稱</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">名</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">中名</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">姓</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="obsolete">Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">歸檔為</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="obsolete">職稱</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">部門</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">公司</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">公司所在街道名稱</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">公司所在城市名稱</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">公司所在州名</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">公司郵遞區號</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">公司所在國家名稱</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">公司呼叫器號碼</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">公司網頁</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">住家所在街道名稱</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">住家所在城市名稱</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">住家所在州名</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">住家郵遞區號</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">住家所在國家名稱</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">個人網頁</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">備註</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index 482b3ec..54a53e0 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -1,960 +1,1030 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (多個.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>商務</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>個人</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (多個.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>新增類別</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>新類別</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>類別編輯</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>類別</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>應用程式</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>類別到這裡</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>全域</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>核取這個文件所屬的類別.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>在這裡輸入新的類別. 按 &lt;b&gt;新增&lt;/b&gt; 來把它加到清單中.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>在左邊輸入新類別並按下以便將它加入清單.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>按下以刪除反白的類別.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>核取以便讓所有的應用程式可以使用這個內容.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>對不起, 另一個應用程式正在
 編輯類別.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>編輯類別</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>顯示所選年份中的一月</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>顯示上個月</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>顯示下個月</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>顯示所選年份中的十二月</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>關閉檔案選擇器</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>顯示這個類型的文件</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>文件檢視</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>顯示這個類別中的文件</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>按一下以便自清單中選擇文件</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, 或選 &lt;b&gt;新增文件&lt;/b&gt; 來建立一個新文件.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;按住並停留以獲知文件內容.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>找不到字串.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation>到達結尾, 從開頭處找起</translation>
+        <translation type="obsolete">到達結尾, 從開頭處找起</translation>
+    </message>
+    <message>
+        <source>End reached, starting at %1</source>
+        <comment>Date using TimeString::shortDate</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>尋找什麼:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>類別:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>開始搜尋於:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>區分大小寫</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>向後搜尋</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>文件檢視</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>檔案偵測失敗.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>複製於 </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>重製</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>檔案複製失敗.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>詳細資料</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>移動文件失敗.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>內容</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>詳細資料</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>註解:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>類型:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>位置</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>快速載入 (消耗記憶體)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>紅外線</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>存放此文件的媒體.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>這個文件的名稱.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>預先載入此應用程式以便能馬上使用它.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>刪除這個文件.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>製作這個文件的副本.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>將這個文件傳輸到另一個裝置.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>使用自訂旋轉</translation>
     </message>
+    <message>
+        <source>Arguments:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>擁有者資訊</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>輸入通行碼</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>在為這個程式建立
 組態資訊
 時發生問題.
 
 請釋放一些空間並
 再試一次.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>無法建立啟動檔案
 在開始輸入資料之前
 請先釋放一些空間</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>無法排程警示.
 請釋放一些記憶體並再試一次.</translation>
     </message>
     <message>
         <source>D</source>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>M</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
         <source>day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>year</source>
         <translation>年</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
         <translation type="obsolete">您確定要刪除
  %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;工作地址:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;住家地阯:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>電子郵件位址: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>住家電話: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>住家傳真: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>住家行動電話: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>個人網頁: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>商務網頁: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>辦公室: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>商務電話: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>商務傳真: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>商務行動電話: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>商務呼叫器: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>職業: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>助理:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>經理: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>男性</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>女性</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>性別: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>配偶: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>生日: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>周年紀念日: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>暱稱: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>名稱 頭銜</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>名</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>中名</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>姓</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>稱呼</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>歸檔為</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>職稱</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>部門</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>公司</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>商務電話</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>商務傳真</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>商務行動電話</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>預設電子郵件</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>電子郵件</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>住家電話</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>住家傳真</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>住家行動電話</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>辦公處 街道</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>辦公處 城市</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>辦公處 州</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>辦公處 郵遞區號</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>辦公處 國家</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>商務呼叫器</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>商務網址</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>辦公室</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>職業</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>助理</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>經理</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>住家 街道</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>住家 城市</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>住家 州</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>住家 郵遞區號</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>住家 國家</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>個人網頁</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>配偶</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>性別</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>周年紀念日</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>暱稱</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>子女</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>備註</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>新增文件</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished">按這裡關閉這個視窗, 放棄所做的變更.</translation>
+        <translation type="obsolete">按這裡關閉這個視窗, 放棄所做的變更.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation type="unfinished">按這裡關閉視窗.</translation>
+        <translation type="obsolete">按這裡關閉視窗.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished">按這裡關閉視窗並接受所有的變更.</translation>
+        <translation type="obsolete">按這裡關閉視窗並接受所有的變更.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation type="unfinished">按這裡讓這個視窗可以移動.</translation>
+        <translation type="obsolete">按這裡讓這個視窗可以移動.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
+        <translation type="obsolete">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished">&lt;QT&gt;泛用說明無法用於這個應用程式, 不過還有內容感應式說明.&lt;p&gt;要使用內容感應式說明:&lt;p&gt;&lt;ol&gt;&lt;li&gt;按住並停留在說明按鈕上.&lt;li&gt;當標題列顯示 &lt;b&gt;這是什麼...&lt;/b&gt; 時, 按一下任何控制元.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished">這是什麼...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="obsolete">錯誤</translation>
     </message>
+    <message>
+        <source>D</source>
+        <comment>Shortcut for Day</comment>
+        <translation type="unfinished">D</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <comment>Shortcur for Month</comment>
+        <translation type="unfinished">M</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 文件</translation>
     </message>
 </context>
 <context>
+    <name>QPEManager</name>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">按這裡關閉這個視窗, 放棄所做的變更.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">按這裡關閉視窗.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">按這裡關閉視窗並接受所有的變更.</translation>
+    </message>
+    <message>
+        <source>Click to make this window movable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF 卡</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD 卡</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI 硬碟</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>內部儲存空間</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>內部記憶體</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC 卡</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>找不到 城市時間 可執行檔</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>為了選擇時區,
 請安裝城市時間.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>無法排程警示.
 請釋放空間後再試一次</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 檔案</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>全部 %1 個檔案</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
 </context>
+<context>
+    <name>WindowDecoration</name>
+    <message>
+        <source>Default</source>
+        <comment>List box text for default window decoration</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index ca9e179..e70e916 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -1,509 +1,524 @@
 <!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">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="obsolete">應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="obsolete">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="obsolete">請按下十字架中心以校正觸控筆</translation>
+        <translation type="unfinished">請按下十字架中心以校正觸控筆</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="obsolete">歡迎進入Opie</translation>
+        <translation type="unfinished">歡迎進入Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="obsolete">文件</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="obsolete">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="obsolete">列表瀏覽</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="obsolete">低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="obsolete">business card </translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="obsolete">訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="obsolete">&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;</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>FirstUseBackground</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> - 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">&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
     </message>
     <message>
         <source>Documents</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>Icon View</source>
         <translation type="unfinished">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">列表瀏覽</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 檔案</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">文件瀏覽</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Mediadlg</name>
+    <message>
+        <source>A new storage media detected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What should I do with it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">影像</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">所有</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="obsolete">連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="obsolete">Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="obsolete">加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">電池狀態</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>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">&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;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="obsolete">低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="obsolete">低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">business card </translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">終止Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">重開機</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">重新啟動Opie</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">&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.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">同步連結</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="obsolete">&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.</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">&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.</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>Syncing</source>
         <translation type="obsolete">同步中</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;連結&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;取消</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index 1401aac..dc36a67 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -1,263 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>設定通行碼</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>輸入通行碼</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>通行碼不正確</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>輸入的通行碼不正確.
 存取已拒絕</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>輸入新的通行碼</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>重新輸入新的通行碼</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24</source>
         <translation type="unfinished">192.168.129.0/24</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>安全性設定</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>清除通行碼</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>在電源開啟時要求輸入通行碼</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>同步化</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>允許來自網路的同步化:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="obsolete">任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="obsolete">無</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="obsolete">192.168.129.0/24 (預設值)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</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>This button will let you change the security passcode.  
 
 Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the current passcode.  
 You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</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>
     <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</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>IntelliSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</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>Both</source>
+        <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/zh_TW/zsafe.ts b/i18n/zh_TW/zsafe.ts
index c6a55e0..d003d7c 100644
--- a/i18n/zh_TW/zsafe.ts
+++ b/i18n/zh_TW/zsafe.ts
@@ -1,814 +1,822 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>ZSafe</source>
-        <translation type="unfinished">ZSafe</translation>
+        <translation type="obsolete">ZSafe</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Löschen</translation>
+        <translation type="obsolete">&amp;Löschen</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="unfinished">&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="unfinished">Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation type="obsolete">Name</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished">Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation type="obsolete">Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
-        <translation type="unfinished">Feld 4</translation>
+        <translation type="obsolete">Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
-        <translation type="unfinished">Feld 5</translation>
+        <translation type="obsolete">Feld 5</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="unfinished">Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="unfinished">Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="unfinished">Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished">&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Field 2</source>
-        <translation type="unfinished">Feld 2</translation>
+        <translation type="obsolete">Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
-        <translation type="unfinished">Feld 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Feld 3</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="unfinished">Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="unfinished">Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="unfinished">Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished">&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="unfinished">&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="unfinished">Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished">&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="unfinished">&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="unfinished">Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="unfinished">Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="unfinished">Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
-        <source>Do you want to save </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Save</source>
-        <translation type="unfinished">&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="unfinished">&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="unfinished">Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="unfinished">Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="unfinished">Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished">Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="unfinished">Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PasswordForm</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
 </context>
 <context>
     <name>ScQtFileDlg</name>
     <message>
         <source>FileDlg</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>file type filter</source>
         <translation>Dateityp Filter</translation>
     </message>
     <message>
         <source>ComboBox FileTypeFilter
 
 edit or select the filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>confirms the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OKButton</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>cancels the selection and closes the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CancelButton</source>
         <translation type="unfinished">Abbruch</translation>
     </message>
     <message>
         <source>shows the selected filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename LineEdit
 
 shows the selected file
 and allows the direct filename
 edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ComboBox Directory 
 edit or select the directories name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
         <source>size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>directory listview</source>
         <translation>Dateilistenansicht</translation>
     </message>
     <message>
         <source>Directory ListView
 
 shows the list of dirs and files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScQtFileEditDlg</name>
     <message>
         <source>dir</source>
         <translation type="unfinished">Verz.</translation>
     </message>
     <message>
         <source>file</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>link</source>
         <translation>Verknüpfung</translation>
     </message>
 </context>
 <context>
     <name>SearchDialog</name>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 %1
 
 ZSafe will now exit.</source>
         <translation>Kann das Verzeichnis
 %1
 nicht anlegen
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
         <source>&amp;Import text file</source>
         <translation>Textdatei &amp;Importieren</translation>
     </message>
     <message>
         <source>&amp;Remove text file</source>
         <translation>Textdatei &amp;löschen</translation>
     </message>
     <message>
         <source>&amp;Open entries expanded</source>
         <translation>&amp;Expandiert Öffnen</translation>
     </message>
     <message>
         <source>E&amp;xit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
         <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
+        <translation type="unfinished">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
+        <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
+        <translation type="unfinished">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
+        <translation type="unfinished">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
+        <translation type="unfinished">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
+        <translation type="unfinished">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
+        <translation type="unfinished">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
+        <translation type="unfinished">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
+        <translation type="unfinished">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
+        <translation type="unfinished">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
+        <translation type="unfinished">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
+        <translation type="unfinished">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
+        <translation type="unfinished">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
+        <translation type="unfinished">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
+        <translation type="unfinished">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
+        <translation type="unfinished">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
+        <translation type="unfinished">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
+        <translation type="unfinished">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation type="obsolete">Mit neuem
+        <translation type="unfinished">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
+        <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
+        <translation type="unfinished">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 .../Documents/application
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t create directory
 ...//Documents/application/zsafe
 
 ZSafe will now exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source></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>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>