update

77 files changed, 3612 insertions, 653 deletions

diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index 0c02c9e..50c62a4 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -1,1154 +1,1171 @@
 <!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>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">nicht eingeteilt</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Vorname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nachname</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Speichern unter</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-Mail</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notizen</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Geschlecht</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Eingabefelderordnung ändern</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">Reihenfolge ändern:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="obsolete">Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">Runter</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>Arrange Edit Fields</source>
         <translation type="obsolete">Eingabefelderordnung ändern</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Nicht genügend Speicherplatz vorhanden</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">Nicht genug Speicherplatz, um
 notwendige Dateien zu erstellen.
 
 Bitte sorgen sie für mehr
 Speicherplatz, bevor sie neue 
 Daten eingeben!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Klein</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="obsolete">Groß</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Schrift</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>Name Title</source>
         <translation type="obsolete">Name Anrede</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notizen</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Geschäftlich</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="obsolete">Mb</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Vorname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nachname</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Speichern unter</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-Mail</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Geschlecht</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>nicht eingeteilt</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>Konfigurations</translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation>OContacts</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 type="obsolete">Die ausgewählte Datei endet
 nicht mit &quot;.vcf&quot;. Soll sie trotzdem
 geöffnet 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 type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></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 is 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 type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax, geschäftlich</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax, privat</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Telefon, geschäftlich</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Telefonnummer</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Handy, geschäftlich</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Handy, privat</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Internetseite, geschäftlich</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Internetseite, privat</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Pager, geschäftlich</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">bevorzugte E-Mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-Mail</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Name Anrede</translation>
     </message>
     <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>Company</source>
         <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notizen</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Gruppen</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Strasse, geschäftlich</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Straße, privat</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="obsolete">Stadt, geschäftlich</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="obsolete">Staat, geschäftlich</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="obsolete">Postleitzahl, geschäftlich</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="obsolete">Bundesland, geschäftlich</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="obsolete">Stadt, privat</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="obsolete">Staat, privat</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="obsolete">Postleitzahl, privat</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="obsolete">Bundesland, privat</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Vollständiger 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>Bundesland</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Vereinigte Staaten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grossbritannien</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation>Afganistan</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>Antartica</source>
         <translation>Antarktis</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentinien</translation>
     </message>
     <message>
         <source>Armania</source>
         <translation>Armenien</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>Boliva</source>
         <translation>Bolivien</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>Camaroon</source>
         <translation>Kamerun</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>Gahna</source>
         <translation>Ghana</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>Guadelupe</source>
         <translation>Guadeloupe</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>Guinea-bissau</source>
         <translation>Guinea-Bissau</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>Jamacia</source>
         <translation>Jamaica</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>Kribati</source>
         <translation>Kiribati</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>
diff --git a/i18n/de/appearance.ts b/i18n/de/appearance.ts
index 13991fd..c01a896 100644
--- a/i18n/de/appearance.ts
+++ b/i18n/de/appearance.ts
@@ -1,141 +1,276 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">Einstellungen...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Aktuelles Schema</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Löschen</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Speichern</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Erscheinungsbild</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Stil</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Schrift</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Farben</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Neustart</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Nein</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Schema löschen</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Kann das aktuelle Schema nicht löschen</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Erscheinungsbild</translation>
+        <translation type="obsolete">Erscheinungsbild</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Stil</translation>
+        <translation type="obsolete">Stil</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Farben</translation>
+        <translation type="obsolete">Farben</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Suche...</translation>
+        <translation type="obsolete">Suche...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Hintergrund</translation>
+        <translation type="obsolete">Hintergrund</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Aktuelles Schema</translation>
+        <translation type="obsolete">Aktuelles Schema</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Speichern</translation>
+        <translation type="obsolete">Speichern</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Aktuelles Schema bearbeiten...</translation>
+        <translation type="obsolete">Aktuelles Schema bearbeiten...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Ja</translation>
+        <translation type="obsolete">Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Nein</translation>
+        <translation type="obsolete">Nein</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Schema löschen</translation>
+        <translation type="obsolete">Schema löschen</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Kann das aktuelle Schema nicht löschen</translation>
+        <translation type="obsolete">Kann das aktuelle Schema nicht löschen</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Auswählen</translation>
+        <translation type="obsolete">Auswählen</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Hintergrundbild aktivieren</translation>
+        <translation type="obsolete">Hintergrundbild aktivieren</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Standard</translation>
+        <translation type="obsolete">Standard</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Schrift</translation>
+        <translation type="obsolete">Schrift</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Größe</translation>
+        <translation type="obsolete">Größe</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
+        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Neustart</translation>
+        <translation type="obsolete">Neustart</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>Wollen Sie Opie nun neu starten?</translation>
+        <translation type="obsolete">Wollen Sie Opie nun neu starten?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Einstellungen...</translation>
+        <translation type="obsolete">Einstellungen...</translation>
     </message>
+</context>
+<context>
+    <name>EditScheme</name>
     <message>
-        <source>Tab style:</source>
-        <translation type="unfinished"></translation>
+        <source>Edit scheme</source>
+        <translation>Schema editieren</translation>
     </message>
+</context>
+<context>
+    <name>SampleWindow</name>
     <message>
-        <source>Tabs</source>
+        <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditScheme</name>
     <message>
-        <source>Edit scheme</source>
-        <translation>Schema editieren</translation>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/checkbook.ts b/i18n/de/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/de/checkbook.ts
+++ b/i18n/de/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/embeddedkonsole.ts b/i18n/de/embeddedkonsole.ts
index f50a5ae..0191fd4 100644
--- a/i18n/de/embeddedkonsole.ts
+++ b/i18n/de/embeddedkonsole.ts
@@ -1,221 +1,225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Befehlsauswahl</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Befehle</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Befehle&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Vorgeschlagene Befehle&lt;/B&gt;</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Konsole</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>winzig</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>klein, fixiert</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>mittel, fixiert</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Eingabe</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Leertaste</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Befehlsliste anzeigen</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Befehlsliste verbergen</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Tabs unten</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Grün auf Schwarz</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Schwarz auf Weiß</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Weiß auf Schwarz</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Schwarz auf Transparent</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Schwarz auf Rot</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rot auf Schwarz</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Grün auf Gelb</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blau auf Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta auf Blau</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan auf Weiß</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Weiß auf Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blau auf Schwaru</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Bernstein auf Schwarz</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Schnelles Editieren</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Laufleiste</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Befehlsleiste anzeigen</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Befehlsliste verstecken</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Befehlsliste</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Töne benutzen</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation>Tabs unten</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Befehlsauswahl</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Befehl hinzufügen</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Geben Sie den Befehl ein,
 den Sie hinzufügen wollen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/systemtime.ts b/i18n/de/systemtime.ts
index 20abcf1..46d5478 100644
--- a/i18n/de/systemtime.ts
+++ b/i18n/de/systemtime.ts
@@ -1,289 +1,289 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
         <translation>time.fu-berlin.de</translation>
     </message>
     <message>
         <source>Run NTP?</source>
         <translation>Starte NTP?</translation>
     </message>
     <message>
         <source>You asked for a delay of </source>
         <translation>Sie haben um eine Verzögerung von</translation>
     </message>
     <message>
         <source> minutes, but only </source>
         <translation>minuten gebeten, es sind nur</translation>
     </message>
     <message>
         <source> minutes elapsed since last lookup.</source>
         <translation>minuten vergangen seit dem letzten Lookup.</translation>
     </message>
     <message>
         <source>Rerun NTP?</source>
         <translation>NTP neu starten?</translation>
     </message>
     <message>
         <source>Running:</source>
         <translation>führe aus:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Fehler beim Ausführen</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>sekunden</translation>
     </message>
     <message>
         <source>last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time: </source>
         <translation>Setz berechnete Zeit:</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>Keine Verbindung zu Server </translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NTP</source>
         <translation>NTP</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Main</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>ntp error</source>
         <translation>NTP Fehler</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
         <translation>Das Netz wollte mir die Zeit nicht verraten!</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation>Fehler beim Nachsehen der
 Zeit auf dem Server</translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
         <translation>Netzwerk Zeit</translation>
     </message>
     <message>
         <source>Get time from network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Shift:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mean shift:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use</source>
         <translation>Verwende</translation>
     </message>
     <message>
         <source>as</source>
         <translation>als</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
         <translation>NTP Server um die Zeit vom Netz zu holen.</translation>
     </message>
     <message>
         <source>Wait for </source>
         <translation type="unfinished">Hehe, also advanced features und Deutsche Sprache?
 wo kämen wir da hin...</translation>
     </message>
     <message>
         <source>minutes until</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insure a delay of</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Main</translation>
     </message>
     <message>
         <source>Manual</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Einstellungen</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NTP</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">NTP</translation>
     </message>
     <message>
         <source>Advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Set System Time</source>
         <translation type="obsolete">Systemzeit einstellen</translation>
     </message>
     <message>
         <source>Time Zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time format</source>
         <translation>Zeitformat</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 Stunden</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 Stunden</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Woche startet am</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sontag</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Datumsformat</translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation>Appletformat</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>ss:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>Sonntag</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/T ss:mm</translation>
     </message>
     <message>
         <source>System Time</source>
         <translation>System Zeit</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation>Stunde</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index c90887d..5b3149d 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -1,669 +1,676 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Neue Aufgabe</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Aufgabe editieren</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished">Aufgabe sehen</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">Löschen...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished">Alles Löschen...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Verdoppeln</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Senden</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Erledigte Aufgaben</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished">Datei</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Optionen</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Alle Kategorien</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Kein Speichplatz mehr</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">&apos;Aufgabe&apos; war nicht in der 
 Lage, Ihre Änderungen zu 
 speichern. Bitte schaffen 
 Sie freien Speicherplatz. 
 Trozdem beenden?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Aufgaben</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">Kann die Daten nicht editieren, synchronisiere gerade</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">nicht eingeteilt</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Aufgaben</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Neue Aufgabe</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorität:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Sehr Hoch</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Hoch</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Niedrig</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Sehr niedrig</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorie:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Erledigt</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="obsolete">&amp;Fällig am</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="obsolete">1. Januar 2001</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="obsolete">Zusammenfassung:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Fortschritt:</translation>
     </message>
     <message>
         <source>0%</source>
         <translation type="obsolete">0%</translation>
     </message>
     <message>
         <source>20%</source>
         <translation type="obsolete">20%</translation>
     </message>
     <message>
         <source>40%</source>
         <translation type="obsolete">40%</translation>
     </message>
     <message>
         <source>60%</source>
         <translation type="obsolete">60%</translation>
     </message>
     <message>
         <source>80%</source>
         <translation type="obsolete">80%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="obsolete">100%</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Beschreibung</translation>
+        <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Aufgabe editieren</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Beschreibung</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">fällig in</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Beschreibung</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Sehr Hoch</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Hoch</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Niedrig</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Sehr niedrig</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorie</translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Aufgaben</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="obsolete">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="obsolete">Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">nicht eingeteilt</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="obsolete">fällig in</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="obsolete">Aufgaben</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Nicht genügend Speicherplatz</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="obsolete">Konnte keine Startdateien erstellen.
 Machen Sie Speicherplatzfrei,
 bevor Sie Daten eingeben.</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Neue Aufgabe</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="obsolete">Senden</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="obsolete">Erledigte Aufgaben</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Kann die Daten nicht editieren, synchronisiere gerade</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="obsolete">Aufgabe editieren</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="obsolete">Alle Kategorien</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">nicht eingeteilt</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="obsolete">Kein Speichplatz mehr</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="obsolete">&apos;Aufgabe&apos; war nicht in der 
 Lage, Ihre Änderungen zu 
 speichern. Bitte schaffen 
 Sie freien Speicherplatz. 
 Trozdem beenden?</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="obsolete">Datei</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="obsolete">Schritart</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="obsolete">Aufgabe sehen</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="obsolete">Löschen...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="obsolete">Alles Löschen...</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="obsolete">Verdoppeln</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">Optionen</translation>
     </message>
     <message>
         <source>all tasks</source>
         <translation type="obsolete">alle Aufgaben</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -1,1011 +1,1028 @@
 <!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>OContacts</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;AllYes</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>
 </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>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</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>Camaroon</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>Palestinian Territory</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</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>
diff --git a/i18n/en/appearance.ts b/i18n/en/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/checkbook.ts b/i18n/en/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/en/checkbook.ts
+++ b/i18n/en/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/embeddedkonsole.ts b/i18n/en/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/en/embeddedkonsole.ts
+++ b/i18n/en/embeddedkonsole.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -1,448 +1,451 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 8de6d00..be0ade6 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -1,1218 +1,1235 @@
 <!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>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">En blanco</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <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>Last Name</source>
         <translation type="obsolete">Apellidos</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Archivar como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Correo-e por omisión</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Género</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Organizando Campos</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">Seleccione el orden de los campos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="obsolete">Subir</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">Bajar</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escribir correo a</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Emitir entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mis detalles personales</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Organizar campos</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">No hay suficiente espacio para crear
 los ficheros iniciales.
 
 ¡Libere algo de espacio antes de
 introducir más datos!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar mis detalles personales</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Dirección</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Mis detalles personales</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Incapaz de guardar la información.
 Libere algo de espacio e
 inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Trabajo</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="obsolete">MB</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Apellidos</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Archivar como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Correo-e por omisión</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Género</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Letra</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequeña</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar vCard</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="obsolete">Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar busqueda</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Guardar datos</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Phone Book</source>
         <translation type="obsolete">Agenda telefónica</translation>
     </message>
     <message>
         <source>Company Book</source>
         <translation type="obsolete">Agenda de la empresas</translation>
     </message>
     <message>
         <source>Email Book</source>
         <translation type="obsolete">Agenda de correo-e</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Tarjetas</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>No encontrado</translation>
     </message>
     <message>
         <source>Unable to find a contact for this</source>
         <translation type="obsolete">¡Incapaz de encontrar un contacto para este</translation>
     </message>
     <message>
         <source>search pattern !</source>
         <translation type="obsolete">patrón de búsqueda!</translation>
     </message>
     <message>
         <source>End of list</source>
         <translation type="obsolete">Fin de la lista</translation>
     </message>
     <message>
         <source>End of list. Wrap around now.. !</source>
         <translation type="obsolete">Fin de la lista. ¡Envolviéndolo ahora!</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>The selected File</source>
         <translation type="obsolete">El fichero seleccionado</translation>
     </message>
     <message>
         <source>does not end with &quot;.vcf&quot; </source>
         <translation type="obsolete">no termina con &quot;.vcf&quot; </translation>
     </message>
     <message>
         <source>Do you really want to open it?</source>
         <translation type="obsolete">¿Seguro que quiere abrirlo?</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 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;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>MyDialog1</source>
         <translation type="obsolete">MyDialog1</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="obsolete">Búsqueda</translation>
     </message>
     <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>Signal Wrap Around</source>
         <translation type="obsolete">Señal envoltura</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>Notice: QT-Mail is just
 provided in the SHARP
 default ROM. Opie-Mail
 is provided free !</source>
         <translation type="obsolete">Aviso: QT-Mail sólo se
 suministra en la Rom de
 SHARP. ¡Opie-Mail se
 suministra gratis!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</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 type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Correo-e por omisión</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Correos-e</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Compañía</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Grupos</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincia</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nombre completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organización</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Cód. postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Gran Bretaña</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japón</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemania</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introducir Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar nombre</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation>Afganistán</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>Antartica</source>
         <translation>Antártida</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armania</source>
         <translation>Armenia</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>Boliva</source>
         <translation>Boliva</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>Camaroon</source>
         <translation>Camerun</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>Gahna</source>
         <translation>Gahna</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>Guadelupe</source>
         <translation>Guadalupe</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>Guinea-bissau</source>
         <translation>Guinea-bissau</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>Jamacia</source>
         <translation>Jamaica</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>Kribati</source>
         <translation>Kribati</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>Palestinian Territory</source>
         <translation>Palestina</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>Pitcairn</source>
         <translation>Pitcairn</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>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 317ded8..299bbd5 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -1,142 +1,314 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">Configurar...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Esquema actual</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Guardar</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished">Estilo etiquetas:</translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished">Etiquetas</translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished">Etiquetas con iconos</translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished">Lista donde soltar</translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished">Lista donde soltar con iconos</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">Arriba</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished">Abajo</translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Apariencia</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Estilo</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Letra</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Colores</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Avanzada</translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Reiniciar</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">No</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Borrar esquema</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Realmente quiere borrar
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Incapaz de borrar el esquema actual.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Apariencia</translation>
+        <translation type="obsolete">Apariencia</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Esquema actual</translation>
+        <translation type="obsolete">Esquema actual</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Guardar</translation>
+        <translation type="obsolete">Guardar</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Colores</translation>
+        <translation type="obsolete">Colores</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Hojear...</translation>
+        <translation type="obsolete">Hojear...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Fondo</translation>
+        <translation type="obsolete">Fondo</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Editar esquema actual...</translation>
+        <translation type="obsolete">Editar esquema actual...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Borrar</translation>
+        <translation type="obsolete">Borrar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Realmente quiere borrar
+        <translation type="obsolete">Realmente quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sí</translation>
+        <translation type="obsolete">Sí</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>No</translation>
+        <translation type="obsolete">No</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Borrar esquema</translation>
+        <translation type="obsolete">Borrar esquema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Incapaz de borrar el esquema actual.</translation>
+        <translation type="obsolete">Incapaz de borrar el esquema actual.</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Seleccionar</translation>
+        <translation type="obsolete">Seleccionar</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Habilitar imagen de fondo</translation>
+        <translation type="obsolete">Habilitar imagen de fondo</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Por omisión</translation>
+        <translation type="obsolete">Por omisión</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Letra</translation>
+        <translation type="obsolete">Letra</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamaño</translation>
+        <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>El Rápido Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+        <translation type="obsolete">El Rápido Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Reiniciar</translation>
+        <translation type="obsolete">Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>¿Quiere reiniciar Opie ahora?</translation>
+        <translation type="obsolete">¿Quiere reiniciar Opie ahora?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Configurar...</translation>
+        <translation type="obsolete">Configurar...</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation>Estilo etiquetas:</translation>
+        <translation type="obsolete">Estilo etiquetas:</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation>Etiquetas</translation>
+        <translation type="obsolete">Etiquetas</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation>Etiquetas con iconos</translation>
+        <translation type="obsolete">Etiquetas con iconos</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation>Lista donde soltar</translation>
+        <translation type="obsolete">Lista donde soltar</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation>Lista donde soltar con iconos</translation>
+        <translation type="obsolete">Lista donde soltar con iconos</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation>Arriba</translation>
+        <translation type="obsolete">Arriba</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>Abajo</translation>
+        <translation type="obsolete">Abajo</translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
-        <translation>Habilitar opciones avanzadas en Opie</translation>
+        <translation type="obsolete">Habilitar opciones avanzadas en Opie</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>Avanzada</translation>
+        <translation type="obsolete">Avanzada</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index 6550726..d1d8dd5 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -1,765 +1,853 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nueva chequera</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacciones</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduzca aquí el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleccione aquí el tipo de chequera.</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Ahorros</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Comprobando</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Dinero mercado</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Fondo mutuo</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Otro</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banco:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Introduzca aquí el banco de esta chequera.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Número cuenta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduzca aquí el nº de cuenta de esta chequera.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduzca aquí el nº PIN de esta chequera.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Balance inicial: </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduzca aquí el balance inicial de esta chequera.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduzca aquí culaquier información adicional de esta chequera.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation>Balance actual: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>Esta área muestra el balance actual en esta chequera.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Ésta es una lista de todas las transacciones de esta chequera.
 
 Para ordenar las entradas por un campo específico, pulse el nombre de la columna.</translation>
     </message>
     <message>
         <source>ID</source>
-        <translation>ID</translation>
+        <translation type="obsolete">ID</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Cantidad</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Pulse aquí para añadir una nueva transacción.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleccione una transacción y pulse aquí para editarla.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione el gráfico deseado y pulse el botón Dibujar.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Seleccione aquí el tipo de gráfico deseado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Balance cuenta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retiradas por categoría</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoría</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dibujar</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Pulse aquí para dibujar el gráfico seleccionado.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>Balance actual: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Borrar transacción</translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Pulse aquí para crear una nueva chequera.
 
 Puede también seleccionar Nueva del menú.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleccione una chequera y pulse aquí para editarla.
 
 Puede también seleccionar Editar del menú, o mantener pulsado el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.
 
 Puede también seleccionar Borrar del menú.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Esta es una lista de todas las chequeras disponibles.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Borrar chequera</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
         <translation type="obsolete">Detalles transacción</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="obsolete">Viaje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="obsolete">Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="obsolete">Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="obsolete">Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="obsolete">Tarjeta crédito</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="obsolete">Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="obsolete">Crédito misc</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="obsolete">Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="obsolete">Efectivo</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntryBase</name>
     <message>
         <source>Account Transaction</source>
         <translation type="obsolete">Transacción contable</translation>
     </message>
     <message>
         <source>$</source>
         <translation type="obsolete">€</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoría:</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Descripción:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="obsolete">Tipo:</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="obsolete">Cantidad:</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="obsolete">Viaje</translation>
     </message>
     <message>
         <source>Check Number:</source>
         <translation type="obsolete">Número cheque:</translation>
     </message>
     <message>
         <source>Extra Fee:</source>
         <translation type="obsolete">Cuota extra:</translation>
     </message>
     <message>
         <source>Additional Notes:</source>
         <translation type="obsolete">Notas adicionales:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="obsolete">Fecha:</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="obsolete">Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="obsolete">Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="obsolete">Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="obsolete">Tarjeta crédito</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="obsolete">Depósito</translation>
     </message>
     <message>
         <source>Payment</source>
         <translation type="obsolete">Pago</translation>
     </message>
 </context>
 <context>
     <name>QCheckGraphBase</name>
     <message>
         <source>Account Graph</source>
         <translation type="obsolete">Gráfico contable</translation>
     </message>
 </context>
 <context>
     <name>QCheckMMBase</name>
     <message>
         <source>Main Menu</source>
         <translation type="obsolete">Menú principal</translation>
     </message>
     <message>
         <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
         <translation type="obsolete">Seleccione una de las chequeras o pulse el icono &quot;Nuevo&quot; de la barra de herramientas.</translation>
     </message>
 </context>
 <context>
     <name>QCheckMainMenu</name>
     <message>
         <source>Delete Account</source>
         <translation type="obsolete">Borrar cuenta</translation>
     </message>
     <message>
         <source>Really delete the
 </source>
         <translation type="obsolete">¿Borrar realmente la</translation>
     </message>
     <message>
         <source> account?</source>
         <translation type="obsolete"> cuenta?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="obsolete">Si</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="obsolete">No</translation>
     </message>
     <message>
         <source>Checkbook</source>
         <translation type="obsolete">Chequera</translation>
     </message>
     <message>
         <source>Could not remove account</source>
         <translation type="obsolete">No pude borrar la cuenta</translation>
     </message>
 </context>
 <context>
     <name>QCheckNameBase</name>
     <message>
         <source>Check Book Name</source>
         <translation type="obsolete">Nombre chequera</translation>
     </message>
     <message>
         <source>Name...</source>
         <translation type="obsolete">Nombre...</translation>
     </message>
     <message>
         <source>Please name your check book (limit: 15 characters):</source>
         <translation type="obsolete">Por favor, nombre su chequera (límite: 15 caracteres):</translation>
     </message>
     <message>
         <source>&amp;Done</source>
         <translation type="obsolete">&amp;Hecho</translation>
     </message>
 </context>
 <context>
     <name>QCheckViewBase</name>
     <message>
         <source>Account Transactions</source>
         <translation type="obsolete">Transacciones contables</translation>
     </message>
     <message>
         <source>$0.00</source>
         <translation type="obsolete">0.00€</translation>
     </message>
     <message>
         <source>Balance:</source>
         <translation type="obsolete">Balance:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="obsolete">Hubo un problema creando
 la información de configuración
 para este programa.
 
 Por favor, libere algo de espacio
 e inténtelo de nuevo.</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transacción para </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Retirada</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione aquí si la transacción es un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione aquí la fecha de la transacción.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduzca aquí el nº del cheque.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduzca aquí la descripción de la transacción.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione aquí la categoría de la transacción.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione aquí el tipo de transacción.
 
 Las opciones disponibles varían según sea un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí la cantidad de la transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí cualquier tasa asociada a esta transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduzca aquí cualquier información adicional de esta transacción.</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation>Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Diversión</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Tarjeta crédito</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Crédito misc</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Efectivo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/embeddedkonsole.ts b/i18n/es/embeddedkonsole.ts
index 9ce923e..a530b23 100644
--- a/i18n/es/embeddedkonsole.ts
+++ b/i18n/es/embeddedkonsole.ts
@@ -1,224 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Impreso 1</translation>
+        <translation type="unfinished">Impreso 1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Fija pequeña</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Fija media</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espacio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Etiquetas abajo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde sobre negro</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Negro sobre blanco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanco sobre negro</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Blanco sobre transparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Negro sobre rojo</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rojo sobre negro</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde sobre amarillo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul sobre magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sobre azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cian sobre blanco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanco sobre cian</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul sobre negro</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ámbar sobre negro</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Editar rápido</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra desp</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista comandos</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Cortar línea</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Timbre</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Añadir comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a añadir:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index fc13d6b..572e6dc 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -1,679 +1,690 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation>Nueva tarea</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editar tarea</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Eliminar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>Borrar todo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Borrado completado</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation>Tareas completadas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation>Mostrar fecha lí­mite</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categorí­a</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Show over due</source>
         <translation type="obsolete">Mostrar fuera de plazo</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Ver</translation>
+        <translation type="obsolete">Ver</translation>
     </message>
     <message>
         <source>New from template</source>
         <translation>Nuevo desde plantilla</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Tareas fue incapaz de
 salvar sus cambios.
 Libere algo de espacio
 e inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>¿todas las tareas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>¿todas las tareas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;Han llegado %1 nuevas tareas.&lt;p&gt;¿Desea añadirlas a su lista de tareas?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nuevas tareas</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation>Mostrar sólo fuera de plazo</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Lista tareas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nueva Tarea</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoría:</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="obsolete">Sumario:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Completada</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="obsolete">&amp;Límite</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="obsolete">1 Ene 2001</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridad:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Muy alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Baja</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progreso:</translation>
     </message>
     <message>
         <source>0%</source>
         <translation type="obsolete">0%</translation>
     </message>
     <message>
         <source>20%</source>
         <translation type="obsolete">20%</translation>
     </message>
     <message>
         <source>40%</source>
         <translation type="obsolete">40%</translation>
     </message>
     <message>
         <source>60%</source>
         <translation type="obsolete">60%</translation>
     </message>
     <message>
         <source>80%</source>
         <translation type="obsolete">80%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="obsolete">100%</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation>Vistazo</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descripción</translation>
+        <translation type="obsolete">Descripción</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Alarmas</translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation>Recordatorios</translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation>Ref.cruzadas</translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation>Recurrencia</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation>Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation> día(s)</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation>Form2</translation>
     </message>
     <message>
         <source>State:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciado</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Pospuesto</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Finalizado</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>No iniciado</translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation>Mantenedor</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation>Modo mantenimiento:</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Hecho por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinador</translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descripción</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation>Form3</translation>
     </message>
     <message>
         <source>empty</source>
         <translation>vacío</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Borrar</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation>1 - Muy alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation>2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation>3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation>4 - Baja</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation>5 - Muy baja</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progreso</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Fecha límite:</translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation>1 enero 2002</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Fecha inicio:</translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation>1 enero 2002</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation>Sumario</translation>
     </message>
     <message>
         <source>Complete</source>
         <translation>Completar</translation>
     </message>
     <message>
         <source>work on</source>
         <translation>trabajar en</translation>
     </message>
     <message>
         <source>buy</source>
         <translation>comprar</translation>
     </message>
     <message>
         <source>organize</source>
         <translation>organizar</translation>
     </message>
     <message>
         <source>get</source>
         <translation>conseguir</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
     <message>
         <source>Plan</source>
         <translation>Planear</translation>
     </message>
     <message>
         <source>Call</source>
         <translation>Llamar</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo a</translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation>Fecha completado</translation>
     </message>
     <message>
         <source>Completed</source>
         <translation>Completado</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation>Habilitar recurrencia</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation>Lista Tareas</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation>Editor de plantillas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nueva plantilla %1</translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation>Configurar Platillas</translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="obsolete">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="obsolete">Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="obsolete">Fecha límite</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">En blanco</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Todas</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="obsolete">Tareas</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="obsolete">Incapaz de crear ficheros
 iniciales. Libere espacio antes
 de introducir algún dato</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nueva tarea</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="obsolete">Editar tarea</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="obsolete">Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="obsolete">Borrar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="obsolete">Borrar todo...</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="obsolete">Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="obsolete">Emitir</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Buscar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="obsolete">Tareas completadas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="obsolete">Mostrar fecha límite</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="obsolete">Letra</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="obsolete">Datos</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="obsolete">Categoría</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">Opciones</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="obsolete">Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">En blanco</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="obsolete">Incapaz de salvar sus
 datos. Libere algo de
 espacio e inténtelo
 de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>all tasks</source>
         <translation type="obsolete">todas las tareas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index 52fb059..16a4c79 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -1,1142 +1,1159 @@
 <!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>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Vide</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <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>Last Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Lister sous</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email par défaut</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notes</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Genre</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Configurer les champs</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">Sélectionner l&apos;ordre des champs :</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="obsolete">Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">Descendre</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trouver</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Ecrire un email à</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Entrée</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mes informations personnelles</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Configurer les champs</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">Pas assez d&apos;espace disponible 
 pour créer les fichiers de démarrage
 
 Libérer de la mémoire avant de pouvoir
 saisir des données !</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossible d&apos;accéder aux données, synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editer mes informations personnelles</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editer une adresse</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacts - Mes informations personnelles</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossible d&apos;enregistrer les informations
 Libérer de la mémoire
 et réessayer
 
 Quitter ?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notes</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Bureau</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="obsolete">Mo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Lister sous</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email par défaut</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Genre</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vide</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Police</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Petit</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grand</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importer une vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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;AllYes</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">Police</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Petit</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Grand</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">Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Descendre</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>Name Title</source>
         <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Second prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Lister sous</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Société</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notes</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Groupes</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Pays</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nom complet...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notes...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Code postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Etats Unies</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grande Bretagne</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japon</translation>
     </message>
     <message>
         <source>France</source>
         <translation>France</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Allemagne</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvège</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculin</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Féminin</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Entrer une note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editer le nom</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation>Afganistan</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>Antartica</source>
         <translation>Antartique</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentine</translation>
     </message>
     <message>
         <source>Armania</source>
         <translation>Arménie</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>Boliva</source>
         <translation>Bolivie</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>Camaroon</source>
         <translation>Cameroun</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>Gahna</source>
         <translation>Gahna</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>Guadelupe</source>
         <translation>Guadeloupe</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>Guinea-bissau</source>
         <translation>Guinée Bissau</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>Jamacia</source>
         <translation>Jamaïque</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>Kribati</source>
         <translation>Kribati</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>Palestinian Territory</source>
         <translation>Palestine</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>Pitcairn</source>
         <translation>Pitcairn</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>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index 2db7722..e7e65cb 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -1,142 +1,277 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">Préférences...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Thème actuel</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Effacer</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Sauver</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Apparence</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Style</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Police</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Couleurs</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Redémarer</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Oui</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Non</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Effacer le thème</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Voulez-vous vraiment effacer</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Impossible d&apos;effacer le thème actuel.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Apparence</translation>
+        <translation type="obsolete">Apparence</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Style</translation>
+        <translation type="obsolete">Style</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Thème actuel</translation>
+        <translation type="obsolete">Thème actuel</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Sauver</translation>
+        <translation type="obsolete">Sauver</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Explorer...</translation>
+        <translation type="obsolete">Explorer...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Fond d&apos;écran</translation>
+        <translation type="obsolete">Fond d&apos;écran</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Editer le thème actuel...</translation>
+        <translation type="obsolete">Editer le thème actuel...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Effacer</translation>
+        <translation type="obsolete">Effacer</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Voulez-vous vraiment effacer</translation>
+        <translation type="obsolete">Voulez-vous vraiment effacer</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Oui</translation>
+        <translation type="obsolete">Oui</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Non</translation>
+        <translation type="obsolete">Non</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Effacer le thème</translation>
+        <translation type="obsolete">Effacer le thème</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Impossible d&apos;effacer le thème actuel.</translation>
+        <translation type="obsolete">Impossible d&apos;effacer le thème actuel.</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Sélectionner</translation>
+        <translation type="obsolete">Sélectionner</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Activer l&apos;image de fond</translation>
+        <translation type="obsolete">Activer l&apos;image de fond</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Réglage par défaut</translation>
+        <translation type="obsolete">Réglage par défaut</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Police</translation>
+        <translation type="obsolete">Police</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Taille</translation>
+        <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Voix ambiguë d&apos;un coeur qui au zéphyr préfère les jattes de kiwis</translation>
+        <translation type="obsolete">Voix ambiguë d&apos;un coeur qui au zéphyr préfère les jattes de kiwis</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Redémarer</translation>
+        <translation type="obsolete">Redémarer</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>Souhaitez-vous redémarrer Opie maintenant ?</translation>
+        <translation type="obsolete">Souhaitez-vous redémarrer Opie maintenant ?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Préférences...</translation>
+        <translation type="obsolete">Préférences...</translation>
     </message>
+</context>
+<context>
+    <name>EditScheme</name>
     <message>
-        <source>Tab style:</source>
-        <translation type="unfinished"></translation>
+        <source>Edit scheme</source>
+        <translation>Editer le thème</translation>
     </message>
+</context>
+<context>
+    <name>SampleWindow</name>
     <message>
-        <source>Tabs</source>
+        <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditScheme</name>
     <message>
-        <source>Edit scheme</source>
-        <translation>Editer le thème</translation>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index 0308055..870624c 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -1,225 +1,225 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection de la commande</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Commandes</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commandes&lt;/B&gt; :</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commandes suggérées&lt;/B&gt; :</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Form1</translation>
+        <translation type="unfinished">Form1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Petite à chasse fixe</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Moyenne à chasse fixe</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entrée</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espace</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulation</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Afficher la liste des commandes</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Cacher la liste des commandes</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Tabs en bas</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Vert sur noir</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Noir sur blanc</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanc sur noir</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Noir sur transparent</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Noir sur rouge</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rouge sur noir</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Vert sur jaune</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Bleue sur magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sur bleue</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan sur blanc</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Blanc sur cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Bleue sur noir</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambre sur noir</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edition rapide</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barre de défilement</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Afficher la liste des commandes</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Cacher la liste des commandes</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personaliser</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection de la commande</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Ajouter une commande</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Entrer la commande à ajouter :</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -1,448 +1,451 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -1,1011 +1,1028 @@
 <!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>OContacts</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;AllYes</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>
 </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>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</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>Camaroon</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>Palestinian Territory</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</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>
diff --git a/i18n/hu/appearance.ts b/i18n/hu/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/hu/appearance.ts
+++ b/i18n/hu/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/checkbook.ts b/i18n/hu/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/hu/checkbook.ts
+++ b/i18n/hu/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/embeddedkonsole.ts b/i18n/hu/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/hu/embeddedkonsole.ts
+++ b/i18n/hu/embeddedkonsole.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -1,448 +1,451 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index b894e7f..2c7c957 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -1,1153 +1,1170 @@
 <!DOCTYPE TS><TS>
 <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>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Vuota</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Cognome</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Visualizza come</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email Principale</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Note</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sesso</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Ordina i Contatti</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">Ordina i contatti per:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="obsolete">Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">Giù</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Dati</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo Contatto</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica Contatto</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella Contatto</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova Contatto</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Scrivi Email A</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importa vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Informazioni Personali</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Ordina Contatti</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Spazio Esaurito</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">Non c&apos;è abbastanza spazio per creare
 i necessari file di avvio.
 
 Liberare dello spazio prima di
 inserire i dati!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Piccolo</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Font</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Modifica Dati Personali</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Modifica Dati</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatti - Dati Personali</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossibile salvare i dati.
 Liberare dello spazio
 e riprovare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Note</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Lavoro</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="obsolete">Mb</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Cognome</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Visualizza come</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email Principale</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sesso</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation>OContatti</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Phone Book</source>
         <translation type="obsolete">Elenco Numeri Telefonici</translation>
     </message>
     <message>
         <source>Company Book</source>
         <translation type="obsolete">Elenco Compagnia</translation>
     </message>
     <message>
         <source>Email Book</source>
         <translation type="obsolete">Elenco Email</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartellini</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>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;AllYes</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">Font</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Piccolo</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Grande</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">Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Giù</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax Ufficio</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax Abitazione</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Telefono Ufficio</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Tleefono Abitazione</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Cellulare Ufficio</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Cellulare Abitazione</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Pagina Web Ufficio</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Cercapersone Ufficio</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>Name Title</source>
         <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Società</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizzazione</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Note</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Gruppi</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="obsolete">Indirizzo Lavoro</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="obsolete">Indirizzo Abitazione</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">Paese Ufficio</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>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>Afganistan</source>
         <translation>Afganistan</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>Antartica</source>
         <translation>Antartica</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armania</source>
         <translation>Armania</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>Boliva</source>
         <translation>Bolivia</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>Camaroon</source>
         <translation>Camerun</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>Gahna</source>
         <translation>Gahna</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>Guadelupe</source>
         <translation>Guadalupe</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>Guinea-bissau</source>
         <translation>Guinea-bissau</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>Jamacia</source>
         <translation>Giamaica</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>Kribati</source>
         <translation>Kribati</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>
diff --git a/i18n/it/checkbook.ts b/i18n/it/checkbook.ts
index 4befc99..7f775f9 100644
--- a/i18n/it/checkbook.ts
+++ b/i18n/it/checkbook.ts
@@ -1,718 +1,802 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished">Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
         <translation type="obsolete">Dettagli Traduzione</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Benzina</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="obsolete">Viaggio</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="obsolete">Debito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="obsolete">Assegno</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="obsolete">Trasferimento</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="obsolete">Carta di Credito</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Lavoro</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="obsolete">Familiare</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="obsolete">Credito</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="obsolete">Pagamento Automatico</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="obsolete">Contante</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntryBase</name>
     <message>
         <source>Account Transaction</source>
         <translation type="obsolete">Transazioni Conto</translation>
     </message>
     <message>
         <source>$</source>
         <translation type="obsolete">E</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Descrizione:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="obsolete">Tipo:</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="obsolete">Ammontare:</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Benzina</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="obsolete">Viaggio</translation>
     </message>
     <message>
         <source>Check Number:</source>
         <translation type="obsolete">Numero:</translation>
     </message>
     <message>
         <source>Extra Fee:</source>
         <translation type="obsolete">Spesa Extra:</translation>
     </message>
     <message>
         <source>Additional Notes:</source>
         <translation type="obsolete">Note Aggiuntive:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="obsolete">Data:</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="obsolete">Debito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="obsolete">Assegno</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="obsolete">Trasferimento</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="obsolete">Carta di Credito</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="obsolete">Deposito</translation>
     </message>
     <message>
         <source>Payment</source>
         <translation type="obsolete">Pagamento</translation>
     </message>
 </context>
 <context>
     <name>QCheckGraphBase</name>
     <message>
         <source>Account Graph</source>
         <translation type="obsolete">Grafico Conto</translation>
     </message>
 </context>
 <context>
     <name>QCheckMMBase</name>
     <message>
         <source>Main Menu</source>
         <translation type="obsolete">Menu Principale</translation>
     </message>
     <message>
         <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
         <translation type="obsolete">Seleziona i libri qui sotto o premi l&apos;icona &quot;Nuovo&quot; nella barra.</translation>
     </message>
 </context>
 <context>
     <name>QCheckNameBase</name>
     <message>
         <source>Check Book Name</source>
         <translation type="obsolete">Controlla Nome Libro</translation>
     </message>
     <message>
         <source>Name...</source>
         <translation type="obsolete">Nome...</translation>
     </message>
     <message>
         <source>Please name your check book (limit: 15 characters):</source>
         <translation type="obsolete">Inserisci il nome del check book (limite: 15 caratteri):</translation>
     </message>
     <message>
         <source>&amp;Done</source>
         <translation type="obsolete">&amp;Fatto</translation>
     </message>
 </context>
 <context>
     <name>QCheckViewBase</name>
     <message>
         <source>Account Transactions</source>
         <translation type="obsolete">Transazioni Conto</translation>
     </message>
     <message>
         <source>$0.00</source>
         <translation type="obsolete">E0.00</translation>
     </message>
     <message>
         <source>Balance:</source>
         <translation type="obsolete">Bilancio:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Spazio Esaurito</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="obsolete">Impossibile creare il file di
 configurazione per questa
 applicazione.
 Liberare dello spazio e
 riprovare.</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished">Deposito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished">Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Descrizione:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished">Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished">Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished">Ammontare:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Benzina</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viaggio</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished">Debito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished">Assegno</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished">Trasferimento</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished">Carta di Credito</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Lavoro</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Familiare</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Credito</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished">Pagamento Automatico</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished">Contante</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/embeddedkonsole.ts b/i18n/it/embeddedkonsole.ts
index c8aaa42..dff4c6d 100644
--- a/i18n/it/embeddedkonsole.ts
+++ b/i18n/it/embeddedkonsole.ts
@@ -1,224 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sezione Comandi</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi Suggeriti&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Form1</translation>
+        <translation type="unfinished">Form1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista Comandi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Visualizza lista comandi</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Nascondi lista comandi</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Tab in Fondo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde su Nero</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Nero su Bianco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bianco su Nero</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Nero su Trasparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Nero su Rosso</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rosso su Nero</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde su Giallo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blu su Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta su Blu</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan su Bianco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bianco su Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blu su Nero</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambra su Nero</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizzato</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Inserisci</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spazio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Modifica veloce</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Disattiva</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra di Scorrimento</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Visualizza Lista Comandi</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Nascondi Lista Comandi</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selezione Comandi</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Inserisci comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Inserisci comando da aggiungere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/addressbook.ts b/i18n/ja/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/ja/addressbook.ts
+++ b/i18n/ja/addressbook.ts
@@ -1,1011 +1,1028 @@
 <!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>OContacts</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;AllYes</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>
 </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>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</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>Camaroon</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>Palestinian Territory</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</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>
diff --git a/i18n/ja/appearance.ts b/i18n/ja/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/ja/appearance.ts
+++ b/i18n/ja/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/checkbook.ts b/i18n/ja/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/ja/checkbook.ts
+++ b/i18n/ja/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/embeddedkonsole.ts b/i18n/ja/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/ja/embeddedkonsole.ts
+++ b/i18n/ja/embeddedkonsole.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/todolist.ts b/i18n/ja/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/ja/todolist.ts
+++ b/i18n/ja/todolist.ts
@@ -1,448 +1,451 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/addressbook.ts b/i18n/ko/addressbook.ts
index cd43cd0..62cb550 100644
--- a/i18n/ko/addressbook.ts
+++ b/i18n/ko/addressbook.ts
@@ -1,1138 +1,1155 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <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>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">정리하지 않음</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">직위</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">이름</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">성</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">정렬할 이름</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">기본 이메일 주소</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">기타</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">성별</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">필드의 순서 정하기</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">필드의 순서를 고르세요</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="obsolete">위로</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">아래로</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>주소록</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>연락처</translation>
     </message>
     <message>
         <source>New</source>
         <translation>새로</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>편집</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>지우기</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>찾기</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>이메일 쓰기</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>무선으로 보내기</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>개인 정보</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">필드의 순서 정하기</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">자리 보족</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">필요한 시작 파일들을 만들 
 자리가 부족합니다.
 
 새 정보를 입력하기 전에 용량을 
 비우시기 바랍니다.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>보기</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>지금 싱크 중이므로, 정보를 편집 할수 없습니다.</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>개인정보 편집</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>주소 편집</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>연락처 - 개인정보</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>용량 부족</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>정보를 저장할수 없습니다.
 자리를 비우시고 
 다시 해보시기 바랍니다.
 
 그래도 끝낼까요?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">직위</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">기타</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">회사</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">이름</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">성</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">정렬할 이름</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">기본 이메일 주소</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">성</translation>
     </message>
     <message>
         <source>All</source>
         <translation>모두</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>정렬 안됨</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">글꼴</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">작은</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">보통</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="obsolete">큰</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>vCard 읽어 오기</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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;AllYes</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">기본 이메일 주소</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">이메일 주소들</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">직위</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>이름</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>중간 이름</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>성</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation>정렬할 이름</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>성</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>직업명</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">회사</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">기타</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">분류들</translation>
     </message>
     <message>
         <source>City</source>
         <translation>도시</translation>
     </message>
     <message>
         <source>State</source>
         <translation>주</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>나라</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>성명</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>조직</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>분류</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>기타...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>일반적인</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>회사</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>집</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>주소</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>우편번호</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>미국</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>영국</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>일본</translation>
     </message>
     <message>
         <source>France</source>
         <translation>프랑스</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>독일</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>노르웨이</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>카네다</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>남성</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>여성</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>자세한 정보</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>노트 입력</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>이름 편집</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>주소록</translation>
     </message>
     <message>
         <source>Afganistan</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>Antartica</source>
         <translation>남극</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>아르헨티나</translation>
     </message>
     <message>
         <source>Armania</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>Boliva</source>
         <translation>볼리비아</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>보츠와나</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>Camaroon</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>Palestinian Territory</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</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>
diff --git a/i18n/ko/appearance.ts b/i18n/ko/appearance.ts
index 5274e0a..0b5c5b3 100644
--- a/i18n/ko/appearance.ts
+++ b/i18n/ko/appearance.ts
@@ -1,142 +1,313 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">설정...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">현재 태마</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">지우기</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">저장</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished">탭의 종류:</translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished">탭</translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished">탭과 아이콘</translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished">드랍다운 리스트</translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished">아이콘 있는 드랍다운 리스트</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">위</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished">아래</translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">태마</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">스타일</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">글꼴</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">색깔</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">고급</translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">재시작</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">예</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">아니오</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">태마 지우기</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">정말로 지울까요</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">태마를 지울수 없습니다</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>태마</translation>
+        <translation type="obsolete">태마</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>스타일</translation>
+        <translation type="obsolete">스타일</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>현재 태마</translation>
+        <translation type="obsolete">현재 태마</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>저장</translation>
+        <translation type="obsolete">저장</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>색깔</translation>
+        <translation type="obsolete">색깔</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>찾기...</translation>
+        <translation type="obsolete">찾기...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>배경화면</translation>
+        <translation type="obsolete">배경화면</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>현재 태마 편집...</translation>
+        <translation type="obsolete">현재 태마 편집...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>지우기</translation>
+        <translation type="obsolete">지우기</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>정말로 지울까요</translation>
+        <translation type="obsolete">정말로 지울까요</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>예</translation>
+        <translation type="obsolete">예</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>아니오</translation>
+        <translation type="obsolete">아니오</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>태마 지우기</translation>
+        <translation type="obsolete">태마 지우기</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>태마를 지울수 없습니다</translation>
+        <translation type="obsolete">태마를 지울수 없습니다</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>선택</translation>
+        <translation type="obsolete">선택</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>배경 이미지를 사용</translation>
+        <translation type="obsolete">배경 이미지를 사용</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>기본</translation>
+        <translation type="obsolete">기본</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>글꼴</translation>
+        <translation type="obsolete">글꼴</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>크기</translation>
+        <translation type="obsolete">크기</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>The Quick Brown Fox Jumps Over The Lazy Dog
+        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog
 가나다라마바사</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>재시작</translation>
+        <translation type="obsolete">재시작</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>지금 오삐를 재시작 할까요?</translation>
+        <translation type="obsolete">지금 오삐를 재시작 할까요?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>설정...</translation>
+        <translation type="obsolete">설정...</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation>탭의 종류:</translation>
+        <translation type="obsolete">탭의 종류:</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation>탭</translation>
+        <translation type="obsolete">탭</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation>탭과 아이콘</translation>
+        <translation type="obsolete">탭과 아이콘</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation>드랍다운 리스트</translation>
+        <translation type="obsolete">드랍다운 리스트</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation>아이콘 있는 드랍다운 리스트</translation>
+        <translation type="obsolete">아이콘 있는 드랍다운 리스트</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation>위</translation>
+        <translation type="obsolete">위</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>아래</translation>
+        <translation type="obsolete">아래</translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
-        <translation>오삐 프로그램들의 고급 옵션들을 키기</translation>
+        <translation type="obsolete">오삐 프로그램들의 고급 옵션들을 키기</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>고급</translation>
+        <translation type="obsolete">고급</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>태마 편집</translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/checkbook.ts b/i18n/ko/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/ko/checkbook.ts
+++ b/i18n/ko/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/embeddedkonsole.ts b/i18n/ko/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/ko/embeddedkonsole.ts
+++ b/i18n/ko/embeddedkonsole.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/todolist.ts b/i18n/ko/todolist.ts
index 17595f3..37facd3 100644
--- a/i18n/ko/todolist.ts
+++ b/i18n/ko/todolist.ts
@@ -1,604 +1,611 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">새 할일</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">할일 편집</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished">할일 보기</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">지우기...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished">모두 지우기...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">복사 하기</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">무선 전송</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">찾기</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">성취한 일들을 표시</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished">마감일을 표시</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished">데이타</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">분류</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">옵션들</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">모든 분류</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">자리 부족</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">수정된 데이타를 저장할수 
 없었습니다.
 자리를 비우시고 
 다시 해보시기 바랍니다.
 
 그래도 끝낼까요?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">할일</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">현제 싱크 중이므로 데이타 편집 불가</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">할일 목록</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">새 할일</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">설명</translation>
+        <translation type="obsolete">설명</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">할일 편집</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">成</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">우선순위</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">설명</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">마감</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">설명</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">분류</translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">할일 목록</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="obsolete">成</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="obsolete">우선순위</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">설명</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">정렬 안됨</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">모두</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="obsolete">마감</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="obsolete">할일</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">자리 부족</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="obsolete">시작 파일들을 만들수 없습니다.
 정보를 입력하기 전에 
 자리를 비워두시기 바랍니다.</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">새 할일</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="obsolete">무선 전송</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">찾기</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="obsolete">성취한 일들을 표시</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">현제 싱크 중이므로 데이타 편집 불가</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="obsolete">할일 편집</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="obsolete">모든 분류</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">정리 안된것들</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="obsolete">자리 부족</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="obsolete">수정된 데이타를 저장할수 
 없었습니다.
 자리를 비우시고 
 다시 해보시기 바랍니다.
 
 그래도 끝낼까요?</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="obsolete">마감일을 표시</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="obsolete">데이타</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="obsolete">글꼴</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="obsolete">할일 보기</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="obsolete">지우기...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="obsolete">모두 지우기...</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="obsolete">복사 하기</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="obsolete">분류</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">옵션들</translation>
     </message>
     <message>
         <source>all tasks</source>
         <translation type="obsolete">모든 할일</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/addressbook.ts b/i18n/no/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/no/addressbook.ts
+++ b/i18n/no/addressbook.ts
@@ -1,1011 +1,1028 @@
 <!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>OContacts</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;AllYes</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>
 </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>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</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>Camaroon</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>Palestinian Territory</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</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>
diff --git a/i18n/no/appearance.ts b/i18n/no/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/no/appearance.ts
+++ b/i18n/no/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/checkbook.ts b/i18n/no/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/no/checkbook.ts
+++ b/i18n/no/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/embeddedkonsole.ts b/i18n/no/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/no/embeddedkonsole.ts
+++ b/i18n/no/embeddedkonsole.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/todolist.ts b/i18n/no/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/no/todolist.ts
+++ b/i18n/no/todolist.ts
@@ -1,448 +1,451 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/opie-i18n-it.control b/i18n/opie-i18n-it.control
index a0e3ffb..8831f03 100644
--- a/i18n/opie-i18n-it.control
+++ b/i18n/opie-i18n-it.control
@@ -1,9 +1,9 @@
 Files: i18n/it/.directory i18n/it/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Daniele Foci <sunscan@sunscan.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: i18n: it
- Italian UI texts for Opie environment.
+ Italian UI texts for OPIE environment.
diff --git a/i18n/opie-i18n-sl.control b/i18n/opie-i18n-sl.control
index b08c52d..84d7141 100644
--- a/i18n/opie-i18n-sl.control
+++ b/i18n/opie-i18n-sl.control
@@ -1,10 +1,10 @@
 Files: i18n/sl/.directory i18n/sl/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Matej Dakol <matej.dakol@gvskupina.si>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
 Description: i18n: Slovenian
- Slovenian UI texts for Opie environment and dictionary.
+ Slovenian UI texts for OPIE environment and dictionary.
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 24c8dc9..31d8285 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -1,1136 +1,1153 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Pelna Nazwa</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Elita</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Pusty</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nazwisko</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Jako</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Domyslny e-mail</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notatka</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Plec</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Rozmiesc pola edycji</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">Wybierz kolejnosc pol:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="obsolete">Gora</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">Dol</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Znajdz</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Napisz e-mail</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Zgloszenia</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Moje dane</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Porzadkuj pola edycji</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Brak miejsca</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">Brak miejsca w pamieci
 na pliki startowe.
 
 Zwolnij miejsce w pamieci!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Czcionka</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nie mozna zmieniac danych podczas synchronizacji</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Edycja moich danych</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Edycja adresu</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakty - moje dane</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca w pamieci</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nie mozna zapisac informacji.
 Zwilnij miejsce w pamieci
 i sprobuj ponownie
 
 Zakonczyc?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notatka</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Praca</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Nazwisko</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Jako</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Domyslny e-mail</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Plec</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>nieprzydzielony</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Maly</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normalny</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="obsolete">Duzy</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>OContacts</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;AllYes</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">Czcionka</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Maly</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normalny</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Duzy</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">Gora</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Dol</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Domyslny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-maile</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Jako</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Plec</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Temat pracy</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notatka</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Grupa</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Wojewodztwo</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Panstwo</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Pelna nazwa...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notatka...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Podstawowe</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Biznes</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Kod pocztowy</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Stany Zjednoczone</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Anglia</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </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>Boliva</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>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>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 Territory</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</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polska</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>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 25beb69..af04df6 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -1,142 +1,246 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
-        <translation>Wyglad</translation>
+        <source>Settings...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
-        <translation>Styl</translation>
+        <source>Current scheme</source>
+        <translation type="unfinished">Aktualny schemat</translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
-        <translation>Edytuj aktualny schemat...</translation>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Usun</translation>
+        <translation type="unfinished">Usun</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Zapisz</translation>
+        <translation type="unfinished">Zapisz</translation>
     </message>
     <message>
-        <source>Colors</source>
-        <translation>Kolory</translation>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
-        <translation>Wyszukaj...</translation>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
-        <translation>Tlo</translation>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
-        <translation>Tak</translation>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
-        <translation>Nie</translation>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
-        <translation>Usun schemat</translation>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
-        <translation>Naprade chcesz skasowac schemat?
-</translation>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
-        <translation>Nie mozna usunac aktualnego schematu.</translation>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
-        <translation>Aktualny schemat</translation>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
-        <translation type="unfinished"></translation>
+        <source>Appearance</source>
+        <translation type="unfinished">Wyglad</translation>
     </message>
     <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
+        <source>Style</source>
+        <translation type="unfinished">Styl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
-        <translation type="unfinished">Rozmiar</translation>
+        <source>Colors</source>
+        <translation type="unfinished">Kolory</translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Yes</source>
+        <translation type="unfinished">Tak</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Nie</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Usun schemat</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Naprade chcesz skasowac schemat?
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Nie mozna usunac aktualnego schematu.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AppearanceSettings</name>
     <message>
-        <source>Drop down list</source>
+        <source>Appearance</source>
+        <translation type="obsolete">Wyglad</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Styl</translation>
+    </message>
+    <message>
+        <source>Edit current scheme...</source>
+        <translation type="obsolete">Edytuj aktualny schemat...</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Usun</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Zapisz</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="obsolete">Kolory</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="obsolete">Wyszukaj...</translation>
+    </message>
+    <message>
+        <source>Background</source>
+        <translation type="obsolete">Tlo</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="obsolete">Tak</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="obsolete">Nie</translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="obsolete">Usun schemat</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="obsolete">Naprade chcesz skasowac schemat?
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="obsolete">Nie mozna usunac aktualnego schematu.</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="obsolete">Aktualny schemat</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Rozmiar</translation>
+    </message>
+</context>
+<context>
+    <name>EditScheme</name>
+    <message>
+        <source>Edit scheme</source>
+        <translation>Edytuj schemat</translation>
+    </message>
+</context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditScheme</name>
     <message>
-        <source>Edit scheme</source>
-        <translation>Edytuj schemat</translation>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/checkbook.ts b/i18n/pl/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/pl/checkbook.ts
+++ b/i18n/pl/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/embeddedkonsole.ts b/i18n/pl/embeddedkonsole.ts
index bcbc872..4fa4add 100644
--- a/i18n/pl/embeddedkonsole.ts
+++ b/i18n/pl/embeddedkonsole.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybor komenty</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Komendy</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Komendy&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Sugerowane&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Male</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Srednie</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Wyswietl liste komend</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ukryj liste komend</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Zakladki na dole</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zielone na czarnym</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Czarne na bialym</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Biale na czarnym</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Biale na przezroczystym</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Czarne na czerwonym</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Czerwone na czarnym</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zielone na zoltym</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Niebieskie na magneta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magneta na Niebieskim</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan na bialym</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Biale na cyanie</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Niebieskie na czarnym</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber na czarnym</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Wprowadz</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spacja</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gora</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Szybka edycja</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Lewo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Prawo</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Przewijanie</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Wyswietl liste komend</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Ukryj liste komend</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybor komendy</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj komende</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Wprowadz komende do dodania:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index a051306..7196e53 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -1,556 +1,563 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nowy proces</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Edycja procesu</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Znajdz</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Zakonczonych procesow</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished">Wyswietl Deadline</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Wszystkie kategorie</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Brak pamieci</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">ZrobTo</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Nieprzypisany</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Lista ZrobTo</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nowy proces</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorytet:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Bardzo wysoki</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Wysoki</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normalny</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Niski</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Bardzo niski</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategoria:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Kompletny</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Edycja procesu</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Bardzo wysoki</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Wysoki</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normalny</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Niski</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Bardzo niski</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Lista ZrobTo</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>Description</source>
         <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Nieprzypisany</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Wszystkie</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="obsolete">ZrobTo</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Brak pamieci</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nowy proces</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Znajdz</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="obsolete">Zakonczonych procesow</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="obsolete">Edycja procesu</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="obsolete">Wszystkie kategorie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Nieprzypisany</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="obsolete">Brak pamieci</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="obsolete">Wyswietl Deadline</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="obsolete">Czcionka</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index 527eb6b..10abd53 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -1,1141 +1,1158 @@
 <!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>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Vazio</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <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>Last Name</source>
         <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Ficheiro Como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-Mail</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sexo</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Arrumar Campos</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">Ordem dos campos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="obsolete">Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">Baixo</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Enviar EMail</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Irradiar Entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Dados</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Arrumar Campos</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Sem Espaço</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">Não há espaço livre para
 guardar os ficheiros iniciais.
 
 Liberte algum espaço
 antes de introduzir dados!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar os Meus Dados</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Meus Dados</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Não há espaço para
 guardar os dados. 
 Liberte algum e tente de novo.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Escritório</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="obsolete">Mb</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Ficheiro Como</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-Mail Principal</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="obsolete">Grande</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar cartão de visita</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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;AllYes</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">Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Grande</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">Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Baixo</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-Mail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-Mails</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Empresa</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Grupos</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Emprego</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código Postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Inglaterra</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japão</translation>
     </message>
     <message>
         <source>France</source>
         <translation>França</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemanha</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introduza Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nome</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation>Afeganistão</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>Antartica</source>
         <translation>Antártida</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argetina</translation>
     </message>
     <message>
         <source>Armania</source>
         <translation>Armânia</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>Boliva</source>
         <translation>Bolívia</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></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>Camaroon</source>
         <translation>Camarões</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 type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colômbia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></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>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grécia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guiné</translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation>Guiné-Bissau</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></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>Jamacia</source>
         <translation>Jamaica</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>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Coreia</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>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malásia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldivas</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritânia</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>México</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronésia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marrocos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Moçambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namíbia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Holanda</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigéria</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>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Território Palestino</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></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>Pitcairn</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ilha da Reunião</translation>
     </message>
     <message>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index 8765458..5490caf 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -1,142 +1,274 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Esquema actual</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Apagar</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Gravar</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Aparência</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Estilo</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Fonte</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Cores</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Reiniciar</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Sim</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Não</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Apagar esquema</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Tem a certeza que quer apagar
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">O esquema actual não pode ser apagado.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Aparência</translation>
+        <translation type="obsolete">Aparência</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Editar o esquema actual...</translation>
+        <translation type="obsolete">Editar o esquema actual...</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Selecionar</translation>
+        <translation type="obsolete">Selecionar</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Apagar</translation>
+        <translation type="obsolete">Apagar</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Gravar</translation>
+        <translation type="obsolete">Gravar</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Activar imagem de fundo</translation>
+        <translation type="obsolete">Activar imagem de fundo</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Omissão</translation>
+        <translation type="obsolete">Omissão</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Procurar...</translation>
+        <translation type="obsolete">Procurar...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Fundo</translation>
+        <translation type="obsolete">Fundo</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sim</translation>
+        <translation type="obsolete">Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Não</translation>
+        <translation type="obsolete">Não</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Apagar esquema</translation>
+        <translation type="obsolete">Apagar esquema</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Tem a certeza que quer apagar
+        <translation type="obsolete">Tem a certeza que quer apagar
 </translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>O esquema actual não pode ser apagado.</translation>
+        <translation type="obsolete">O esquema actual não pode ser apagado.</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Esquema actual</translation>
+        <translation type="obsolete">Esquema actual</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Fonte</translation>
+        <translation type="obsolete">Fonte</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamanho</translation>
+        <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>A rápida raposa castanha salta sobre o cão molenga</translation>
+        <translation type="obsolete">A rápida raposa castanha salta sobre o cão molenga</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Reiniciar</translation>
+        <translation type="obsolete">Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>Reiniciar o Opie agora?</translation>
+        <translation type="obsolete">Reiniciar o Opie agora?</translation>
     </message>
+</context>
+<context>
+    <name>EditScheme</name>
     <message>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Edit scheme</source>
+        <translation>Editar esquema</translation>
     </message>
+</context>
+<context>
+    <name>SampleWindow</name>
     <message>
-        <source>Tab style:</source>
+        <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Sample window using the selected settings.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>EditScheme</name>
-    <message>
-        <source>Edit scheme</source>
-        <translation>Editar esquema</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt/checkbook.ts b/i18n/pt/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/pt/checkbook.ts
+++ b/i18n/pt/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/embeddedkonsole.ts b/i18n/pt/embeddedkonsole.ts
index d145716..656faeb 100644
--- a/i18n/pt/embeddedkonsole.ts
+++ b/i18n/pt/embeddedkonsole.ts
@@ -1,224 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção do Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos&lt;/b&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos Sugeridos&lt;/b&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Form1</translation>
+        <translation type="unfinished">Form1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Média</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Pastas em Baixo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde em Preto</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Preto em Branco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Branco em Preto</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Preto em Transparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Preto em Vermelho</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Vermelho em Preto</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde em Amarelo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul em Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta em Azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Ciano em Branco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Branco em Ciano</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul em Preto</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambar em Preto</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fontes</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edição Rápida</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção de Comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Adicionar comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a adicionar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index ba92425..150adcd 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -1,616 +1,623 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished">Ver Tarefa</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">Apagar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished">Apagar Todas...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Irradiar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Procurar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Tarefas Completas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished">Mostrar Limite</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished">Dados</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Categoria</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Opções</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Todas as Categoria</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Sem espaço</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Tarefa</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Vazio</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Lista Tarefas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="obsolete">Sumário:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Completo</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="obsolete">&amp;Limite</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="obsolete">1 Jan 2001</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Muito Alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Baixa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Muito Baixa</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">Pri.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">Limite</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Muito Alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Baixa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Muito Baixa</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Categoria</translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Lista Tarefas</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="obsolete">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="obsolete">Pri.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="obsolete">Limite</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Vazio</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Tudo</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="obsolete">Tarefa</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Sem espaço</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="obsolete">Editar Tarefa</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="obsolete">Ver Tarefa</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="obsolete">Apagar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="obsolete">Apagar Todas...</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="obsolete">Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="obsolete">Irradiar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Procurar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="obsolete">Tarefas Completas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="obsolete">Mostrar Limite</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="obsolete">Fontes</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="obsolete">Dados</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="obsolete">Categoria</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">Opções</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="obsolete">Todas as Categoria</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Vazio</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="obsolete">Sem espaço</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 2f98699..53317cc 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -1,1125 +1,1142 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Pick</source>
         <translation>Escolha</translation>
     </message>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Não Preenchido</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Primeiro Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Sobrenome</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-mail Padrão</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Arquivar Como</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Up</source>
         <translation type="obsolete">P/ Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">P/ Baixo</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Organizar Campos de Edição</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">Selecione a ordem dos campos:</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Mb</source>
         <translation type="obsolete">Mb</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Trabalho</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">Não há espaço suficiente para criar
 os arquivos iniciais necessários.
 Libere algum espaço antes de
 inserir dados!</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossível salvar informação.
 Libere algum espaço e
 tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatos</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Sobrenome</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Organizar Campos de Edição</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-mail Padrão</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Arquivar Como</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Out of Space</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Sem Espaço</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escrever E-mail Para</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Enviar Registro</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatos - Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>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>OContacts</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;AllYes</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">P/ Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">P/ Baixo</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-mail Padrão</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished">Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished">Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished">Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished">Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished">Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished">Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished">Escrever Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contatos</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</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>Camaroon</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>Palestinian Territory</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</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>
diff --git a/i18n/pt_BR/appearance.ts b/i18n/pt_BR/appearance.ts
index bee8fa2..cd0bb6e 100644
--- a/i18n/pt_BR/appearance.ts
+++ b/i18n/pt_BR/appearance.ts
@@ -1,142 +1,188 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished">Aparncia</translation>
+        <source>Settings...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
-        <translation type="unfinished"></translation>
+        <source>Appearance</source>
+        <translation type="unfinished">Aparncia</translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+    <message>
+        <source>Appearance</source>
+        <translation type="obsolete">Aparncia</translation>
+    </message>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/checkbook.ts b/i18n/pt_BR/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/pt_BR/checkbook.ts
+++ b/i18n/pt_BR/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/embeddedkonsole.ts b/i18n/pt_BR/embeddedkonsole.ts
index 3cfe3fc..bf31588 100644
--- a/i18n/pt_BR/embeddedkonsole.ts
+++ b/i18n/pt_BR/embeddedkonsole.ts
@@ -1,221 +1,225 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished">&lt;B&gt;Comandos&lt;/B&gt;</translation>
     </message>
     <message>
         <source>Commands</source>
         <translation type="unfinished">Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished">&lt;B&gt;Comandos Sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Up</source>
         <translation>Acima</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Aba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abaixo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entra</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Fixa Média</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Fixa Pequena</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished">Entre comando a adicionar:</translation>
     </message>
     <message>
         <source>Add command</source>
         <translation type="unfinished">Adicionar comando</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index 7e5a94f..677554e 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -1,592 +1,599 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Enviar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Localizar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Tarefas completadas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Sem Espaço</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">Tarefas não pode
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Tarefas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Lista de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>D&amp;ue</source>
         <translation type="obsolete">&amp;Prazo</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Completada</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Baixa</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Muito Alta</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Muito Baixa</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Muito Alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Baixa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Muito Baixa</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Lista de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="obsolete">C.</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Todas</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="obsolete">Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Não preenchida</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Beam</source>
         <translation type="obsolete">Enviar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Localizar</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="obsolete">Tarefas</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="obsolete">Editar Tarefa</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="obsolete">Impossível criar arquivos iniciais
 Libere algum espaço
 antes de inserir dados</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="obsolete">Tarefas completadas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="obsolete">Tarefas não pode
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Não preenchido</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="obsolete">Sem Espaço</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Sem Espaço</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index dbaa6eb..7f41e3d 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -1,1141 +1,1158 @@
 <!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>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Brez</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Ime</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Priimek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Datoteka kot</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Privzeta epošta</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Opombe</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Spol</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Uredi urejevalna polja</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="obsolete">Izberi zaporedje polj:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="obsolete">Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="obsolete">Dol</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Pošlji epošto</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Prežarči vnos</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="obsolete">Uredi urejevalna polja</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="obsolete">Ni dovolj prostora za potrebne
 zagonske datoteke.
 
 Sprostite nekaj prostora preden
 vnesete podatke!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urejati podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Uredi moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Uredi naslov</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Stiki - Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Ne morem shraniti informacije.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Naziv</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Zapiski</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Služba</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="obsolete">Mobitel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Ime</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Priimek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="obsolete">Datoteka kot</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Privzeta epošta</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Spol</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="obsolete">Pisava</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="obsolete">Mala</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="obsolete">Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="obsolete">Velika</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Uvozi vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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;AllYes</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">Pisava</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Mala</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Velika</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">Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Dol</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>
 </context>
 <context>
     <name>ContactEditor</name>
     <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>Name Title</source>
         <translation type="obsolete">Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Delovno mesto</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Podjetje</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Skupine</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Mesto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Pokrajina</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Država</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Polno ime...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Zapiski...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Službeno</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Naslov</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Poštna številka</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Združene države</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Velika Britanija</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japonska</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francija</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Nemčija</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norveška</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženski</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Vpišite zapiske</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Uredi ime</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation>Afganistan</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>Antartica</source>
         <translation>Antartika</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Armania</source>
         <translation>Armanija</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>Boliva</source>
         <translation>Bolivija</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>Camaroon</source>
         <translation>Kamerun</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>Gahna</source>
         <translation>Gana</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>Guadelupe</source>
         <translation>Gvadelup</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>Guinea-bissau</source>
         <translation>Guinea-bissau</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>Jamacia</source>
         <translation>Jamajka</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>Kribati</source>
         <translation>Kribati</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>Palestinian Territory</source>
         <translation>Palestinsko ozemlje</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>Pitcairn</source>
         <translation>Pitcairn</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>
diff --git a/i18n/sl/appearance.ts b/i18n/sl/appearance.ts
index c2b7f19..2839eb6 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -1,142 +1,314 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">Nastavitve...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Trenutna shema</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Izbriši</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Shrani</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished">Stil zavihka:</translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished">Zavihki</translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished">Zavihki - ikone</translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished">Roletni seznam</translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished">Roletni seznam - ikone</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">Zgoraj</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished">Spodaj</translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Videz</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Stil</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Pisava</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Barve</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Napredno</translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Ponovno zaženi</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Da</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Ne</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Izbriši shemo</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Ali res želite izbrisati
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Ne morem izbrisati trenutne sheme.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Videz</translation>
+        <translation type="obsolete">Videz</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Stil</translation>
+        <translation type="obsolete">Stil</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Trenutna shema</translation>
+        <translation type="obsolete">Trenutna shema</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Shrani</translation>
+        <translation type="obsolete">Shrani</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Barve</translation>
+        <translation type="obsolete">Barve</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Prebrskaj...</translation>
+        <translation type="obsolete">Prebrskaj...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Ozadje</translation>
+        <translation type="obsolete">Ozadje</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Nastavi trenutno shemo...</translation>
+        <translation type="obsolete">Nastavi trenutno shemo...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Izbriši</translation>
+        <translation type="obsolete">Izbriši</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Ali res želite izbrisati
+        <translation type="obsolete">Ali res želite izbrisati
 </translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Da</translation>
+        <translation type="obsolete">Da</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Ne</translation>
+        <translation type="obsolete">Ne</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Izbriši shemo</translation>
+        <translation type="obsolete">Izbriši shemo</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Ne morem izbrisati trenutne sheme.</translation>
+        <translation type="obsolete">Ne morem izbrisati trenutne sheme.</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Izberi</translation>
+        <translation type="obsolete">Izberi</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Vklopi sliko v ozadju</translation>
+        <translation type="obsolete">Vklopi sliko v ozadju</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Privzeto</translation>
+        <translation type="obsolete">Privzeto</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Pisava</translation>
+        <translation type="obsolete">Pisava</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Velikost</translation>
+        <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Hitra lisica skoči čez lenega psa</translation>
+        <translation type="obsolete">Hitra lisica skoči čez lenega psa</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Ponovno zaženi</translation>
+        <translation type="obsolete">Ponovno zaženi</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>Ali želite zdaj ponovno zagnati Opie?</translation>
+        <translation type="obsolete">Ali želite zdaj ponovno zagnati Opie?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Nastavitve...</translation>
+        <translation type="obsolete">Nastavitve...</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation>Stil zavihka:</translation>
+        <translation type="obsolete">Stil zavihka:</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation>Zavihki</translation>
+        <translation type="obsolete">Zavihki</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation>Zavihki - ikone</translation>
+        <translation type="obsolete">Zavihki - ikone</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation>Roletni seznam</translation>
+        <translation type="obsolete">Roletni seznam</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation>Roletni seznam - ikone</translation>
+        <translation type="obsolete">Roletni seznam - ikone</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation>Zgoraj</translation>
+        <translation type="obsolete">Zgoraj</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>Spodaj</translation>
+        <translation type="obsolete">Spodaj</translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
-        <translation>Vklopi napredne izbire v Opie programih</translation>
+        <translation type="obsolete">Vklopi napredne izbire v Opie programih</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>Napredno</translation>
+        <translation type="obsolete">Napredno</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Uredi shemo</translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/checkbook.ts b/i18n/sl/checkbook.ts
index 1a57289..ac79455 100644
--- a/i18n/sl/checkbook.ts
+++ b/i18n/sl/checkbook.ts
@@ -1,719 +1,803 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished">Tip:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
         <translation type="obsolete">Podrobnosti transakcije</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Račun</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVDji</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="obsolete">Potovanje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="obsolete">Dolg</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="obsolete">Ček</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="obsolete">Prenos</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="obsolete">Kreditna kartica</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="obsolete">Delo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="obsolete">Član družine</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="obsolete">Različni krediti</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="obsolete">Avtomatsko plačilo</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="obsolete">Gotovina</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntryBase</name>
     <message>
         <source>Account Transaction</source>
         <translation type="obsolete">Transakcija računa</translation>
     </message>
     <message>
         <source>$</source>
         <translation type="obsolete">SIT</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorija:</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Opis:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="obsolete">Tip:</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="obsolete">Količina:</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Računi</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVDji</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="obsolete">Potovanje</translation>
     </message>
     <message>
         <source>Check Number:</source>
         <translation type="obsolete">Številka čeka:</translation>
     </message>
     <message>
         <source>Extra Fee:</source>
         <translation type="obsolete">Dodaten honorar:</translation>
     </message>
     <message>
         <source>Additional Notes:</source>
         <translation type="obsolete">Dodatne opombe:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="obsolete">Datum:</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="obsolete">Dolg</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="obsolete">Ček</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="obsolete">Prenos</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="obsolete">Kreditna kartica</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="obsolete">Depozit</translation>
     </message>
     <message>
         <source>Payment</source>
         <translation type="obsolete">Plačilo</translation>
     </message>
 </context>
 <context>
     <name>QCheckGraphBase</name>
     <message>
         <source>Account Graph</source>
         <translation type="obsolete">Graf računa</translation>
     </message>
 </context>
 <context>
     <name>QCheckMMBase</name>
     <message>
         <source>Main Menu</source>
         <translation type="obsolete">Glavni menu</translation>
     </message>
     <message>
         <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
         <translation type="obsolete">Izberite iz čekovne knjižice spodaj ali kliknite &quot;Nov&quot; ikono na orodni vrstici.</translation>
     </message>
 </context>
 <context>
     <name>QCheckNameBase</name>
     <message>
         <source>Check Book Name</source>
         <translation type="obsolete">Ime čekovne knjižice</translation>
     </message>
     <message>
         <source>Name...</source>
         <translation type="obsolete">Ime...</translation>
     </message>
     <message>
         <source>Please name your check book (limit: 15 characters):</source>
         <translation type="obsolete">Prosim imenujte vašo čekovno knjižico (15 znakov):</translation>
     </message>
     <message>
         <source>&amp;Done</source>
         <translation type="obsolete">&amp;Narejeno</translation>
     </message>
 </context>
 <context>
     <name>QCheckViewBase</name>
     <message>
         <source>Account Transactions</source>
         <translation type="obsolete">Transakcija računa</translation>
     </message>
     <message>
         <source>$0.00</source>
         <translation type="obsolete">0,00 SIT</translation>
     </message>
     <message>
         <source>Balance:</source>
         <translation type="obsolete">Stanje:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="obsolete">Prišlo je do problema pri kreiranju
 nastavitvenih informacij 
 za ta program.
 
 Prosim sprostite nekaj prostora in
 poizkusite ponovno.</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished">Depozit</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished">Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished">Kategorija:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished">Tip:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished">Količina:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished">DVDji</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Potovanje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished">Dolg</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished">Ček</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished">Prenos</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished">Kreditna kartica</translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished">Delo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished">Član družine</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished">Različni krediti</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished">Avtomatsko plačilo</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished">Gotovina</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/embeddedkonsole.ts b/i18n/sl/embeddedkonsole.ts
index 65bbdba..d174f70 100644
--- a/i18n/sl/embeddedkonsole.ts
+++ b/i18n/sl/embeddedkonsole.ts
@@ -1,224 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Ukazi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Ukazi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Predlagani ukazi&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Obrazec1</translation>
+        <translation type="unfinished">Obrazec1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Mikro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Majne fiksne</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Srednje fiksne</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Presledek</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Jezički na dnu</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zelena na črni</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Črna na beli</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bela na črni</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Črna na prozorni</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Črna na rdeči</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rdeča na črni</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zelena na rumeni</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Modra na Vijolčni</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Vijolčna na modri</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Svetlo modra na beli</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bela na svetlo modri</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Modra na črni</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber na črni</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Hitro uredi</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Levo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Desno</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Drsnik</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Po izbiri</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Seznam ukazov</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Dodaj ukaz</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Vpiši ukaz, ki naj ga dodam:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index 2bf42fa..bc0d9a3 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -1,675 +1,682 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Novo opravilo</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Uredi opravilo</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished">Poglej opravila</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">Izbriši...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished">Izbriši vse...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Podvoji</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Prežarči</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Najdi</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Končana opravila</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished">Prikaži rok</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished">Podatki</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorija</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Izbire</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Vse kategorije</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">Ne uspem
 shraniti vaših sprememb.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Opravki</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Neizpolnjeno</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Seznam opravkov</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Novo opravilo</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prednost:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Zelo visoka</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Visoka</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normalna</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Nizka</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Zelo nizka</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorija:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Končano</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="obsolete">Z&amp;apade</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="obsolete">1 Jan 2001</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="obsolete">Povzetek:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Napredovanje:</translation>
     </message>
     <message>
         <source>0%</source>
         <translation type="obsolete">0%</translation>
     </message>
     <message>
         <source>20%</source>
         <translation type="obsolete">20%</translation>
     </message>
     <message>
         <source>40%</source>
         <translation type="obsolete">40%</translation>
     </message>
     <message>
         <source>60%</source>
         <translation type="obsolete">60%</translation>
     </message>
     <message>
         <source>80%</source>
         <translation type="obsolete">80%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="obsolete">100%</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Uredi opravilo</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">K.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">Pred.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Zelo visoka</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Visoka</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normalna</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Nizka</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Zelo nizka</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorija</translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Seznam opravkov</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="obsolete">K.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="obsolete">Pred.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Neizpolnjeno</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="obsolete">Vse</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="obsolete">Rok</translation>
     </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="obsolete">Opravki</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="obsolete">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="obsolete">Ne uspem ustvariti zagonskih datotek
 Sprostite nekaj prostora
 preden vnesete podatke</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Novo opravilo</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="obsolete">Prežarči</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="obsolete">Najdi</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="obsolete">Končana opravila</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="obsolete">Uredi opravilo</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="obsolete">Vse kategorije</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="obsolete">Neizpolnjeno</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="obsolete">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="obsolete">Ne uspem
 shraniti vaših sprememb.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="obsolete">Prikaži rok</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="obsolete">Podatki</translation>
     </message>
     <message>
         <source>Fonts</source>
         <translation type="obsolete">Pisave</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="obsolete">Poglej opravila</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="obsolete">Izbriši...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="obsolete">Izbriši vse...</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="obsolete">Podvoji</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="obsolete">Kategorija</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">Izbire</translation>
     </message>
     <message>
         <source>all tasks</source>
         <translation type="obsolete">vsa opravila</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/status.sh b/i18n/status.sh
new file mode 100755
index 0000000..3bffe12
--- a/dev/null
+++ b/i18n/status.sh
@@ -0,0 +1,7 @@
+#/bin/sh
+echo "number of strings: "
+grep translation go.ts | wc -l
+echo "unfinished: "
+grep translation go.ts | grep type=\"unfinished\" | wc -l
+echo "obsolete: "
+grep translation go.ts | grep type=\"obsolete\" | wc -l
diff --git a/i18n/zh_CN/addressbook.ts b/i18n/zh_CN/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/zh_CN/addressbook.ts
+++ b/i18n/zh_CN/addressbook.ts
@@ -1,1011 +1,1028 @@
 <!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>OContacts</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;AllYes</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>
 </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>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</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>Camaroon</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>Palestinian Territory</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</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>
diff --git a/i18n/zh_CN/appearance.ts b/i18n/zh_CN/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/zh_CN/appearance.ts
+++ b/i18n/zh_CN/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/checkbook.ts b/i18n/zh_CN/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/zh_CN/checkbook.ts
+++ b/i18n/zh_CN/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/embeddedkonsole.ts b/i18n/zh_CN/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/zh_CN/embeddedkonsole.ts
+++ b/i18n/zh_CN/embeddedkonsole.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/todolist.ts b/i18n/zh_CN/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/zh_CN/todolist.ts
+++ b/i18n/zh_CN/todolist.ts
@@ -1,448 +1,451 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -1,1011 +1,1028 @@
 <!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>OContacts</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;AllYes</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>
 </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>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</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>Camaroon</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>Gahna</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>Guadelupe</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>Jamacia</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>Kribati</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>Palestinian Territory</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</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>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/checkbook.ts b/i18n/zh_TW/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/zh_TW/checkbook.ts
+++ b/i18n/zh_TW/checkbook.ts
@@ -1,421 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/embeddedkonsole.ts b/i18n/zh_TW/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/zh_TW/embeddedkonsole.ts
+++ b/i18n/zh_TW/embeddedkonsole.ts
@@ -1,220 +1,224 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -1,448 +1,451 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2002</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Januar 2001</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>work on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>buy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>organize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>get</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverViewImpl</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TemplateEditor</name>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>