6 files changed, 297 insertions, 50 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,1674 +1,1691 @@
 <!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>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation>Palästina</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Neu Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippinen</translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ile La Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumänien</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi Arabien</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellen</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovakei</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenien</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon-Inseln</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Südafrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanien</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Sankt Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swasiland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Schweden</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Schweiz</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadschikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tansania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesien</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Türkei</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Usbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Jungfraueninseln</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Westsahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavien</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Sambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Notiz eingeben</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Namen ändern</translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="obsolete">Abteilung</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="obsolete">Büro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="obsolete">Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="obsolete">Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="obsolete">Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="obsolete">Ehepartner</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="obsolete">Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="obsolete">Kinder</translation>
     </message>
     <message>
         <source>Work Phone</source>
         <translation type="obsolete">Tel., geschäftlich</translation>
     </message>
     <message>
         <source>Work Fax</source>
         <translation type="obsolete">Fax, geschläftlich</translation>
     </message>
     <message>
         <source>work Mobile</source>
         <translation type="obsolete">Handy, geschäftlich</translation>
     </message>
     <message>
         <source>Work Pager</source>
         <translation type="obsolete">Pager, geschäftlich</translation>
     </message>
     <message>
         <source>Work Web Page</source>
         <translation type="obsolete">Internetseite, geschäftlich</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
         <source>Work Mobile</source>
         <translation type="obsolete">Handy, geschäftlich</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Kyrgystan</source>
         <translation>Kyrgystan</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation>Telefon, geschäftlich</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax, geschäftlich</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Handy, geschäftlich</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Haupt-E-Mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-Mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefonnummer</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax, privat</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Handy, privat</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Ehepartner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinder</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titel</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>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Abteilung</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Straße, geschäftlich</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Stadt, geschäftlich</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Staat, geschäftlich</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Postleitzahl, geschäftlich</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Bundesland, geschäftlich</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager, geschäftlich</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Internetseite, geschäftlich</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Straße, privat</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Stadt, privat</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Staat, privat</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Postleitzahl, privat</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Bundesland, privat</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Internetseite, privat</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
 </context>
 </TS>
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>