update

77 files changed, 3612 insertions, 653 deletions

diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index 0c02c9e..50c62a4 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -236,215 +236,232 @@ Dennoch beenden?</translation>
         <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>
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
@@ -55,248 +55,332 @@
     </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>
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,89 +1,93 @@
 <!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>
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
@@ -120,145 +120,145 @@ Zeit auf dem Server</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>
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,132 +1,128 @@
 <!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>
@@ -152,247 +148,258 @@ Trozdem beenden?</translation>
         <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>
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -94,214 +94,231 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/appearance.ts b/i18n/en/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/checkbook.ts b/i18n/en/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/en/checkbook.ts
+++ b/i18n/en/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/en/embeddedkonsole.ts b/i18n/en/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/en/embeddedkonsole.ts
+++ b/i18n/en/embeddedkonsole.ts
@@ -1,89 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -1,308 +1,311 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 8de6d00..be0ade6 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -268,247 +268,264 @@ inténtelo de nuevo.
     </message>
     <message>
         <source>Not Found</source>
         <translation>No encontrado</translation>
     </message>
     <message>
         <source>Unable to find a contact for this</source>
         <translation type="obsolete">¡Incapaz de encontrar un contacto para este</translation>
     </message>
     <message>
         <source>search pattern !</source>
         <translation type="obsolete">patrón de búsqueda!</translation>
     </message>
     <message>
         <source>End of list</source>
         <translation type="obsolete">Fin de la lista</translation>
     </message>
     <message>
         <source>End of list. Wrap around now.. !</source>
         <translation type="obsolete">Fin de la lista. ¡Envolviéndolo ahora!</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Tarjeta</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Iniciar búsqueda</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>¿Tipo fichero correcto?</translation>
     </message>
     <message>
         <source>The selected File</source>
         <translation type="obsolete">El fichero seleccionado</translation>
     </message>
     <message>
         <source>does not end with &quot;.vcf&quot; </source>
         <translation type="obsolete">no termina con &quot;.vcf&quot; </translation>
     </message>
     <message>
         <source>Do you really want to open it?</source>
         <translation type="obsolete">¿Seguro que quiere abrirlo?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sí</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>MyDialog1</source>
         <translation type="obsolete">MyDialog1</translation>
     </message>
     <message>
         <source>Search</source>
         <translation type="obsolete">Búsqueda</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Estilo consulta</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usar expresiones regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar comodines (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Signal Wrap Around</source>
         <translation type="obsolete">Señal envoltura</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Prefiere QT-Mail </translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Prefiere Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just
 provided in the SHARP
 default ROM. Opie-Mail
 is provided free !</source>
         <translation type="obsolete">Aviso: QT-Mail sólo se
 suministra en la Rom de
 SHARP. ¡Opie-Mail se
 suministra gratis!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configuración de Búsqueda</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Aviso: QT-Mail sólo se
 suministra en la Rom de
 SHARP. ¡Opie-Mail se
 suministra gratis!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Orden</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Seleccionar orden de contactos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bajar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Correo-e por omisión</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Correos-e</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Compañía</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Grupos</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincia</translation>
     </message>
     <message>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 317ded8..299bbd5 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -1,142 +1,314 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">Configurar...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Esquema actual</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Guardar</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished">Estilo etiquetas:</translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished">Etiquetas</translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished">Etiquetas con iconos</translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished">Lista donde soltar</translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished">Lista donde soltar con iconos</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">Arriba</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished">Abajo</translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Apariencia</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Estilo</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Letra</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Colores</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Avanzada</translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Reiniciar</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">No</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Borrar esquema</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Realmente quiere borrar
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Incapaz de borrar el esquema actual.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Apariencia</translation>
+        <translation type="obsolete">Apariencia</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Esquema actual</translation>
+        <translation type="obsolete">Esquema actual</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Guardar</translation>
+        <translation type="obsolete">Guardar</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Colores</translation>
+        <translation type="obsolete">Colores</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Hojear...</translation>
+        <translation type="obsolete">Hojear...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Fondo</translation>
+        <translation type="obsolete">Fondo</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Editar esquema actual...</translation>
+        <translation type="obsolete">Editar esquema actual...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Borrar</translation>
+        <translation type="obsolete">Borrar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Realmente quiere borrar
+        <translation type="obsolete">Realmente quiere borrar
 </translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sí</translation>
+        <translation type="obsolete">Sí</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>No</translation>
+        <translation type="obsolete">No</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Borrar esquema</translation>
+        <translation type="obsolete">Borrar esquema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Incapaz de borrar el esquema actual.</translation>
+        <translation type="obsolete">Incapaz de borrar el esquema actual.</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Seleccionar</translation>
+        <translation type="obsolete">Seleccionar</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Habilitar imagen de fondo</translation>
+        <translation type="obsolete">Habilitar imagen de fondo</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Por omisión</translation>
+        <translation type="obsolete">Por omisión</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Letra</translation>
+        <translation type="obsolete">Letra</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamaño</translation>
+        <translation type="obsolete">Tamaño</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>El Rápido Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
+        <translation type="obsolete">El Rápido Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Reiniciar</translation>
+        <translation type="obsolete">Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>¿Quiere reiniciar Opie ahora?</translation>
+        <translation type="obsolete">¿Quiere reiniciar Opie ahora?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Configurar...</translation>
+        <translation type="obsolete">Configurar...</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation>Estilo etiquetas:</translation>
+        <translation type="obsolete">Estilo etiquetas:</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation>Etiquetas</translation>
+        <translation type="obsolete">Etiquetas</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation>Etiquetas con iconos</translation>
+        <translation type="obsolete">Etiquetas con iconos</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation>Lista donde soltar</translation>
+        <translation type="obsolete">Lista donde soltar</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation>Lista donde soltar con iconos</translation>
+        <translation type="obsolete">Lista donde soltar con iconos</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation>Arriba</translation>
+        <translation type="obsolete">Arriba</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>Abajo</translation>
+        <translation type="obsolete">Abajo</translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
-        <translation>Habilitar opciones avanzadas en Opie</translation>
+        <translation type="obsolete">Habilitar opciones avanzadas en Opie</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>Avanzada</translation>
+        <translation type="obsolete">Avanzada</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index 6550726..d1d8dd5 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -58,253 +58,341 @@
         <translation>Fondo mutuo</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Otro</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banco:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Introduzca aquí el banco de esta chequera.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Número cuenta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduzca aquí el nº de cuenta de esta chequera.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduzca aquí el nº PIN de esta chequera.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Balance inicial: </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduzca aquí el balance inicial de esta chequera.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduzca aquí culaquier información adicional de esta chequera.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation>Balance actual: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>Esta área muestra el balance actual en esta chequera.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Ésta es una lista de todas las transacciones de esta chequera.
 
 Para ordenar las entradas por un campo específico, pulse el nombre de la columna.</translation>
     </message>
     <message>
         <source>ID</source>
-        <translation>ID</translation>
+        <translation type="obsolete">ID</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Cantidad</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Pulse aquí para añadir una nueva transacción.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleccione una transacción y pulse aquí para editarla.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione el gráfico deseado y pulse el botón Dibujar.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Seleccione aquí el tipo de gráfico deseado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Balance cuenta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retiradas por categoría</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoría</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dibujar</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Pulse aquí para dibujar el gráfico seleccionado.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>Balance actual: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Borrar transacción</translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Pulse aquí para crear una nueva chequera.
 
 Puede también seleccionar Nueva del menú.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleccione una chequera y pulse aquí para editarla.
 
 Puede también seleccionar Editar del menú, o mantener pulsado el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.
 
 Puede también seleccionar Borrar del menú.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Esta es una lista de todas las chequeras disponibles.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Borrar chequera</translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
         <translation type="obsolete">Detalles transacción</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
diff --git a/i18n/es/embeddedkonsole.ts b/i18n/es/embeddedkonsole.ts
index 9ce923e..a530b23 100644
--- a/i18n/es/embeddedkonsole.ts
+++ b/i18n/es/embeddedkonsole.ts
@@ -1,92 +1,92 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selección de comandos</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Impreso 1</translation>
+        <translation type="unfinished">Impreso 1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Fija pequeña</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Fija media</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espacio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ocultar lista comandos</translation>
     </message>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index fc13d6b..572e6dc 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -2,129 +2,129 @@
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation>Nueva tarea</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editar tarea</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Eliminar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>Borrar todo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Borrado completado</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation>Tareas completadas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation>Mostrar fecha lí­mite</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categorí­a</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Show over due</source>
         <translation type="obsolete">Mostrar fuera de plazo</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Ver</translation>
+        <translation type="obsolete">Ver</translation>
     </message>
     <message>
         <source>New from template</source>
         <translation>Nuevo desde plantilla</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Tareas fue incapaz de
 salvar sus cambios.
 Libere algo de espacio
 e inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>¿todas las tareas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>¿todas las tareas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;Han llegado %1 nuevas tareas.&lt;p&gt;¿Desea añadirlas a su lista de tareas?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nuevas tareas</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation>Mostrar sólo fuera de plazo</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
@@ -157,247 +157,258 @@ e inténtelo de nuevo.
         <source>1 Jan 2001</source>
         <translation type="obsolete">1 Ene 2001</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridad:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Muy alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Baja</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Progreso:</translation>
     </message>
     <message>
         <source>0%</source>
         <translation type="obsolete">0%</translation>
     </message>
     <message>
         <source>20%</source>
         <translation type="obsolete">20%</translation>
     </message>
     <message>
         <source>40%</source>
         <translation type="obsolete">40%</translation>
     </message>
     <message>
         <source>60%</source>
         <translation type="obsolete">60%</translation>
     </message>
     <message>
         <source>80%</source>
         <translation type="obsolete">80%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="obsolete">100%</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation>Vistazo</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descripción</translation>
+        <translation type="obsolete">Descripción</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation>Alarmas</translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation>Recordatorios</translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation>Ref.cruzadas</translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation>Recurrencia</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation>Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation> día(s)</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation>Form2</translation>
     </message>
     <message>
         <source>State:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciado</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Pospuesto</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Finalizado</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>No iniciado</translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation>Mantenedor</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation>Modo mantenimiento:</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Hecho por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinador</translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descripción</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation>Form3</translation>
     </message>
     <message>
         <source>empty</source>
         <translation>vacío</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Borrar</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation>1 - Muy alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation>2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation>3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation>4 - Baja</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation>5 - Muy baja</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progreso</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index 52fb059..16a4c79 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -225,214 +225,231 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importer une vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Police</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Petit</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Grand</translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Descendre</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email par défaut</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Emails</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Second prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Lister sous</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Société</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notes</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Groupes</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Département</translation>
     </message>
     <message>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index 2db7722..e7e65cb 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -1,142 +1,277 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">Préférences...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Thème actuel</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Effacer</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Sauver</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Apparence</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Style</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Police</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Couleurs</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Redémarer</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Oui</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Non</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Effacer le thème</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Voulez-vous vraiment effacer</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Impossible d&apos;effacer le thème actuel.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Apparence</translation>
+        <translation type="obsolete">Apparence</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Style</translation>
+        <translation type="obsolete">Style</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Thème actuel</translation>
+        <translation type="obsolete">Thème actuel</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Sauver</translation>
+        <translation type="obsolete">Sauver</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Couleurs</translation>
+        <translation type="obsolete">Couleurs</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Explorer...</translation>
+        <translation type="obsolete">Explorer...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Fond d&apos;écran</translation>
+        <translation type="obsolete">Fond d&apos;écran</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Editer le thème actuel...</translation>
+        <translation type="obsolete">Editer le thème actuel...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Effacer</translation>
+        <translation type="obsolete">Effacer</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Voulez-vous vraiment effacer</translation>
+        <translation type="obsolete">Voulez-vous vraiment effacer</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Oui</translation>
+        <translation type="obsolete">Oui</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Non</translation>
+        <translation type="obsolete">Non</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Effacer le thème</translation>
+        <translation type="obsolete">Effacer le thème</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Impossible d&apos;effacer le thème actuel.</translation>
+        <translation type="obsolete">Impossible d&apos;effacer le thème actuel.</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Sélectionner</translation>
+        <translation type="obsolete">Sélectionner</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Activer l&apos;image de fond</translation>
+        <translation type="obsolete">Activer l&apos;image de fond</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Réglage par défaut</translation>
+        <translation type="obsolete">Réglage par défaut</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Police</translation>
+        <translation type="obsolete">Police</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Taille</translation>
+        <translation type="obsolete">Taille</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Voix ambiguë d&apos;un coeur qui au zéphyr préfère les jattes de kiwis</translation>
+        <translation type="obsolete">Voix ambiguë d&apos;un coeur qui au zéphyr préfère les jattes de kiwis</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Redémarer</translation>
+        <translation type="obsolete">Redémarer</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>Souhaitez-vous redémarrer Opie maintenant ?</translation>
+        <translation type="obsolete">Souhaitez-vous redémarrer Opie maintenant ?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Préférences...</translation>
+        <translation type="obsolete">Préférences...</translation>
     </message>
+</context>
+<context>
+    <name>EditScheme</name>
     <message>
-        <source>Tab style:</source>
-        <translation type="unfinished"></translation>
+        <source>Edit scheme</source>
+        <translation>Editer le thème</translation>
     </message>
+</context>
+<context>
+    <name>SampleWindow</name>
     <message>
-        <source>Tabs</source>
+        <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditScheme</name>
     <message>
-        <source>Edit scheme</source>
-        <translation>Editer le thème</translation>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index 0308055..870624c 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -1,93 +1,93 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sélection de la commande</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Commandes</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commandes&lt;/B&gt; :</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Commandes suggérées&lt;/B&gt; :</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Form1</translation>
+        <translation type="unfinished">Form1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Petite à chasse fixe</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Moyenne à chasse fixe</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entrée</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espace</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulation</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Afficher la liste des commandes</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Cacher la liste des commandes</translation>
     </message>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -1,308 +1,311 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -94,214 +94,231 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/appearance.ts b/i18n/hu/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/hu/appearance.ts
+++ b/i18n/hu/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/checkbook.ts b/i18n/hu/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/hu/checkbook.ts
+++ b/i18n/hu/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/hu/embeddedkonsole.ts b/i18n/hu/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/hu/embeddedkonsole.ts
+++ b/i18n/hu/embeddedkonsole.ts
@@ -1,89 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -1,308 +1,311 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index b894e7f..2c7c957 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -236,214 +236,231 @@ Uscire comunque?</translation>
     </message>
     <message>
         <source>Phone Book</source>
         <translation type="obsolete">Elenco Numeri Telefonici</translation>
     </message>
     <message>
         <source>Company Book</source>
         <translation type="obsolete">Elenco Compagnia</translation>
     </message>
     <message>
         <source>Email Book</source>
         <translation type="obsolete">Elenco Email</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartellini</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Font</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Piccolo</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Giù</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Business Fax</source>
         <translation type="obsolete">Fax Ufficio</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="obsolete">Fax Abitazione</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="obsolete">Telefono Ufficio</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="obsolete">Tleefono Abitazione</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="obsolete">Cellulare Ufficio</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="obsolete">Cellulare Abitazione</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="obsolete">Pagina Web Ufficio</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="obsolete">Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="obsolete">Cercapersone Ufficio</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Altre Email</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
diff --git a/i18n/it/checkbook.ts b/i18n/it/checkbook.ts
index 4befc99..7f775f9 100644
--- a/i18n/it/checkbook.ts
+++ b/i18n/it/checkbook.ts
@@ -55,248 +55,332 @@
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
         <translation type="obsolete">Dettagli Traduzione</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Benzina</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
diff --git a/i18n/it/embeddedkonsole.ts b/i18n/it/embeddedkonsole.ts
index c8aaa42..dff4c6d 100644
--- a/i18n/it/embeddedkonsole.ts
+++ b/i18n/it/embeddedkonsole.ts
@@ -1,92 +1,92 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sezione Comandi</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi Suggeriti&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Form1</translation>
+        <translation type="unfinished">Form1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista Comandi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Visualizza lista comandi</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Nascondi lista comandi</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Tab in Fondo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde su Nero</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Nero su Bianco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bianco su Nero</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Nero su Trasparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Nero su Rosso</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rosso su Nero</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde su Giallo</translation>
     </message>
diff --git a/i18n/ja/addressbook.ts b/i18n/ja/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/ja/addressbook.ts
+++ b/i18n/ja/addressbook.ts
@@ -94,214 +94,231 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/appearance.ts b/i18n/ja/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/ja/appearance.ts
+++ b/i18n/ja/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/checkbook.ts b/i18n/ja/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/ja/checkbook.ts
+++ b/i18n/ja/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/ja/embeddedkonsole.ts b/i18n/ja/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/ja/embeddedkonsole.ts
+++ b/i18n/ja/embeddedkonsole.ts
@@ -1,89 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/todolist.ts b/i18n/ja/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/ja/todolist.ts
+++ b/i18n/ja/todolist.ts
@@ -1,308 +1,311 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/ko/addressbook.ts b/i18n/ko/addressbook.ts
index cd43cd0..62cb550 100644
--- a/i18n/ko/addressbook.ts
+++ b/i18n/ko/addressbook.ts
@@ -221,214 +221,231 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>vCard 읽어 오기</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">글꼴</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">작은</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">보통</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">큰</translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">위로</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">아래로</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">기본 이메일 주소</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">이메일 주소들</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">직위</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>이름</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>중간 이름</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>성</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation>정렬할 이름</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>성</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>직업명</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">회사</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">기타</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">분류들</translation>
     </message>
     <message>
         <source>City</source>
         <translation>도시</translation>
     </message>
     <message>
         <source>State</source>
         <translation>주</translation>
     </message>
     <message>
diff --git a/i18n/ko/appearance.ts b/i18n/ko/appearance.ts
index 5274e0a..0b5c5b3 100644
--- a/i18n/ko/appearance.ts
+++ b/i18n/ko/appearance.ts
@@ -1,142 +1,313 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">설정...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">현재 태마</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">지우기</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">저장</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished">탭의 종류:</translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished">탭</translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished">탭과 아이콘</translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished">드랍다운 리스트</translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished">아이콘 있는 드랍다운 리스트</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">위</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished">아래</translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">태마</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">스타일</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">글꼴</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">색깔</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">고급</translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">재시작</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">예</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">아니오</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">태마 지우기</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">정말로 지울까요</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">태마를 지울수 없습니다</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>태마</translation>
+        <translation type="obsolete">태마</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>스타일</translation>
+        <translation type="obsolete">스타일</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>현재 태마</translation>
+        <translation type="obsolete">현재 태마</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>저장</translation>
+        <translation type="obsolete">저장</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>색깔</translation>
+        <translation type="obsolete">색깔</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>찾기...</translation>
+        <translation type="obsolete">찾기...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>배경화면</translation>
+        <translation type="obsolete">배경화면</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>현재 태마 편집...</translation>
+        <translation type="obsolete">현재 태마 편집...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>지우기</translation>
+        <translation type="obsolete">지우기</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>정말로 지울까요</translation>
+        <translation type="obsolete">정말로 지울까요</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>예</translation>
+        <translation type="obsolete">예</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>아니오</translation>
+        <translation type="obsolete">아니오</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>태마 지우기</translation>
+        <translation type="obsolete">태마 지우기</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>태마를 지울수 없습니다</translation>
+        <translation type="obsolete">태마를 지울수 없습니다</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>선택</translation>
+        <translation type="obsolete">선택</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>배경 이미지를 사용</translation>
+        <translation type="obsolete">배경 이미지를 사용</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>기본</translation>
+        <translation type="obsolete">기본</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>글꼴</translation>
+        <translation type="obsolete">글꼴</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>크기</translation>
+        <translation type="obsolete">크기</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>The Quick Brown Fox Jumps Over The Lazy Dog
+        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog
 가나다라마바사</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>재시작</translation>
+        <translation type="obsolete">재시작</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>지금 오삐를 재시작 할까요?</translation>
+        <translation type="obsolete">지금 오삐를 재시작 할까요?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>설정...</translation>
+        <translation type="obsolete">설정...</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation>탭의 종류:</translation>
+        <translation type="obsolete">탭의 종류:</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation>탭</translation>
+        <translation type="obsolete">탭</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation>탭과 아이콘</translation>
+        <translation type="obsolete">탭과 아이콘</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation>드랍다운 리스트</translation>
+        <translation type="obsolete">드랍다운 리스트</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation>아이콘 있는 드랍다운 리스트</translation>
+        <translation type="obsolete">아이콘 있는 드랍다운 리스트</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation>위</translation>
+        <translation type="obsolete">위</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>아래</translation>
+        <translation type="obsolete">아래</translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
-        <translation>오삐 프로그램들의 고급 옵션들을 키기</translation>
+        <translation type="obsolete">오삐 프로그램들의 고급 옵션들을 키기</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>고급</translation>
+        <translation type="obsolete">고급</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>태마 편집</translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/checkbook.ts b/i18n/ko/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/ko/checkbook.ts
+++ b/i18n/ko/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/ko/embeddedkonsole.ts b/i18n/ko/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/ko/embeddedkonsole.ts
+++ b/i18n/ko/embeddedkonsole.ts
@@ -1,89 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/todolist.ts b/i18n/ko/todolist.ts
index 17595f3..37facd3 100644
--- a/i18n/ko/todolist.ts
+++ b/i18n/ko/todolist.ts
@@ -2,327 +2,334 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">새 할일</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">할일 편집</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished">할일 보기</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">지우기...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished">모두 지우기...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">복사 하기</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">무선 전송</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">찾기</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">성취한 일들을 표시</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished">마감일을 표시</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished">데이타</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">분류</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">옵션들</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">모든 분류</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">자리 부족</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">수정된 데이타를 저장할수 
 없었습니다.
 자리를 비우시고 
 다시 해보시기 바랍니다.
 
 그래도 끝낼까요?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">할일</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">현제 싱크 중이므로 데이타 편집 불가</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">할일 목록</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">새 할일</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">설명</translation>
+        <translation type="obsolete">설명</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">할일 편집</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">成</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">우선순위</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">설명</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">마감</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">설명</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/no/addressbook.ts b/i18n/no/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/no/addressbook.ts
+++ b/i18n/no/addressbook.ts
@@ -94,214 +94,231 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/appearance.ts b/i18n/no/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/no/appearance.ts
+++ b/i18n/no/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/checkbook.ts b/i18n/no/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/no/checkbook.ts
+++ b/i18n/no/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/no/embeddedkonsole.ts b/i18n/no/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/no/embeddedkonsole.ts
+++ b/i18n/no/embeddedkonsole.ts
@@ -1,89 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/todolist.ts b/i18n/no/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/no/todolist.ts
+++ b/i18n/no/todolist.ts
@@ -1,308 +1,311 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/opie-i18n-it.control b/i18n/opie-i18n-it.control
index a0e3ffb..8831f03 100644
--- a/i18n/opie-i18n-it.control
+++ b/i18n/opie-i18n-it.control
@@ -1,9 +1,9 @@
 Files: i18n/it/.directory i18n/it/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Daniele Foci <sunscan@sunscan.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: i18n: it
- Italian UI texts for Opie environment.
+ Italian UI texts for OPIE environment.
diff --git a/i18n/opie-i18n-sl.control b/i18n/opie-i18n-sl.control
index b08c52d..84d7141 100644
--- a/i18n/opie-i18n-sl.control
+++ b/i18n/opie-i18n-sl.control
@@ -1,10 +1,10 @@
 Files: i18n/sl/.directory i18n/sl/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Matej Dakol <matej.dakol@gvskupina.si>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), qpf-cyberbit-120-50-t10
 Description: i18n: Slovenian
- Slovenian UI texts for Opie environment and dictionary.
+ Slovenian UI texts for OPIE environment and dictionary.
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 24c8dc9..31d8285 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -219,214 +219,231 @@ Zakonczyc?</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Czcionka</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Maly</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normalny</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Duzy</translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">Gora</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Dol</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Domyslny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-maile</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Jako</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Plec</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Temat pracy</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notatka</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Grupa</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Wojewodztwo</translation>
     </message>
     <message>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 25beb69..af04df6 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -1,142 +1,246 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
-        <translation>Wyglad</translation>
+        <source>Settings...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
-        <translation>Styl</translation>
+        <source>Current scheme</source>
+        <translation type="unfinished">Aktualny schemat</translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
-        <translation>Edytuj aktualny schemat...</translation>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Usun</translation>
+        <translation type="unfinished">Usun</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Zapisz</translation>
+        <translation type="unfinished">Zapisz</translation>
     </message>
     <message>
-        <source>Colors</source>
-        <translation>Kolory</translation>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
-        <translation>Wyszukaj...</translation>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
-        <translation>Tlo</translation>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
-        <translation>Tak</translation>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
-        <translation>Nie</translation>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
-        <translation>Usun schemat</translation>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
-        <translation>Naprade chcesz skasowac schemat?
-</translation>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
-        <translation>Nie mozna usunac aktualnego schematu.</translation>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
-        <translation>Aktualny schemat</translation>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
-        <translation type="unfinished"></translation>
+        <source>Appearance</source>
+        <translation type="unfinished">Wyglad</translation>
     </message>
     <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
+        <source>Style</source>
+        <translation type="unfinished">Styl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
-        <translation type="unfinished">Rozmiar</translation>
+        <source>Colors</source>
+        <translation type="unfinished">Kolory</translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Yes</source>
+        <translation type="unfinished">Tak</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Nie</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Usun schemat</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Naprade chcesz skasowac schemat?
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Nie mozna usunac aktualnego schematu.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AppearanceSettings</name>
     <message>
-        <source>Drop down list</source>
+        <source>Appearance</source>
+        <translation type="obsolete">Wyglad</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="obsolete">Styl</translation>
+    </message>
+    <message>
+        <source>Edit current scheme...</source>
+        <translation type="obsolete">Edytuj aktualny schemat...</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">Usun</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">Zapisz</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="obsolete">Kolory</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <translation type="obsolete">Wyszukaj...</translation>
+    </message>
+    <message>
+        <source>Background</source>
+        <translation type="obsolete">Tlo</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="obsolete">Tak</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="obsolete">Nie</translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="obsolete">Usun schemat</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="obsolete">Naprade chcesz skasowac schemat?
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="obsolete">Nie mozna usunac aktualnego schematu.</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="obsolete">Aktualny schemat</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Rozmiar</translation>
+    </message>
+</context>
+<context>
+    <name>EditScheme</name>
+    <message>
+        <source>Edit scheme</source>
+        <translation>Edytuj schemat</translation>
+    </message>
+</context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditScheme</name>
     <message>
-        <source>Edit scheme</source>
-        <translation>Edytuj schemat</translation>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/checkbook.ts b/i18n/pl/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/pl/checkbook.ts
+++ b/i18n/pl/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/pl/embeddedkonsole.ts b/i18n/pl/embeddedkonsole.ts
index bcbc872..4fa4add 100644
--- a/i18n/pl/embeddedkonsole.ts
+++ b/i18n/pl/embeddedkonsole.ts
@@ -1,89 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybor komenty</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Komendy</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Komendy&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Sugerowane&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Male</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Srednie</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Wyswietl liste komend</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ukryj liste komend</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Zakladki na dole</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zielone na czarnym</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Czarne na bialym</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Biale na czarnym</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Biale na przezroczystym</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Czarne na czerwonym</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Czerwone na czarnym</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zielone na zoltym</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Niebieskie na magneta</translation>
     </message>
     <message>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index a051306..7196e53 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -1,354 +1,361 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nowy proces</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Edycja procesu</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Znajdz</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Zakonczonych procesow</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished">Wyswietl Deadline</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Wszystkie kategorie</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Brak pamieci</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">ZrobTo</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Nieprzypisany</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Lista ZrobTo</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nowy proces</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Priorytet:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Bardzo wysoki</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Wysoki</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normalny</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Niski</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Bardzo niski</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategoria:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Kompletny</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Edycja procesu</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Bardzo wysoki</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Wysoki</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normalny</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Niski</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Bardzo niski</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index 527eb6b..10abd53 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -224,214 +224,231 @@ Sair na mesma?</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar cartão de visita</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Baixo</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-Mail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">E-Mails</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Empresa</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Grupos</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index 8765458..5490caf 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -1,142 +1,274 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Esquema actual</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Apagar</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Gravar</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Aparência</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Estilo</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Fonte</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Cores</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Reiniciar</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Sim</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Não</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Apagar esquema</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Tem a certeza que quer apagar
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">O esquema actual não pode ser apagado.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Aparência</translation>
+        <translation type="obsolete">Aparência</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Estilo</translation>
+        <translation type="obsolete">Estilo</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Editar o esquema actual...</translation>
+        <translation type="obsolete">Editar o esquema actual...</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Selecionar</translation>
+        <translation type="obsolete">Selecionar</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Apagar</translation>
+        <translation type="obsolete">Apagar</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Gravar</translation>
+        <translation type="obsolete">Gravar</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Cores</translation>
+        <translation type="obsolete">Cores</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Activar imagem de fundo</translation>
+        <translation type="obsolete">Activar imagem de fundo</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Omissão</translation>
+        <translation type="obsolete">Omissão</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Procurar...</translation>
+        <translation type="obsolete">Procurar...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Fundo</translation>
+        <translation type="obsolete">Fundo</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Sim</translation>
+        <translation type="obsolete">Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Não</translation>
+        <translation type="obsolete">Não</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Apagar esquema</translation>
+        <translation type="obsolete">Apagar esquema</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Tem a certeza que quer apagar
+        <translation type="obsolete">Tem a certeza que quer apagar
 </translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>O esquema actual não pode ser apagado.</translation>
+        <translation type="obsolete">O esquema actual não pode ser apagado.</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Esquema actual</translation>
+        <translation type="obsolete">Esquema actual</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Fonte</translation>
+        <translation type="obsolete">Fonte</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Tamanho</translation>
+        <translation type="obsolete">Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>A rápida raposa castanha salta sobre o cão molenga</translation>
+        <translation type="obsolete">A rápida raposa castanha salta sobre o cão molenga</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Reiniciar</translation>
+        <translation type="obsolete">Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>Reiniciar o Opie agora?</translation>
+        <translation type="obsolete">Reiniciar o Opie agora?</translation>
     </message>
+</context>
+<context>
+    <name>EditScheme</name>
     <message>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
+        <source>Edit scheme</source>
+        <translation>Editar esquema</translation>
     </message>
+</context>
+<context>
+    <name>SampleWindow</name>
     <message>
-        <source>Tab style:</source>
+        <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Disabled Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Normal Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Highlighted Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Sample window using the selected settings.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>EditScheme</name>
-    <message>
-        <source>Edit scheme</source>
-        <translation>Editar esquema</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt/checkbook.ts b/i18n/pt/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/pt/checkbook.ts
+++ b/i18n/pt/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/pt/embeddedkonsole.ts b/i18n/pt/embeddedkonsole.ts
index d145716..656faeb 100644
--- a/i18n/pt/embeddedkonsole.ts
+++ b/i18n/pt/embeddedkonsole.ts
@@ -1,92 +1,92 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção do Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos&lt;/b&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos Sugeridos&lt;/b&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Form1</translation>
+        <translation type="unfinished">Form1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Média</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Pastas em Baixo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde em Preto</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Preto em Branco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Branco em Preto</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Preto em Transparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Preto em Vermelho</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Vermelho em Preto</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde em Amarelo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul em Magenta</translation>
     </message>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index ba92425..150adcd 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -1,366 +1,373 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished">Ver Tarefa</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">Apagar...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished">Apagar Todas...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Duplicar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Irradiar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Procurar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Tarefas Completas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished">Mostrar Limite</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished">Dados</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Categoria</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Opções</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Todas as Categoria</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Sem espaço</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Tarefa</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Vazio</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Lista Tarefas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="obsolete">Sumário:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Completo</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="obsolete">&amp;Limite</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="obsolete">1 Jan 2001</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Muito Alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Baixa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Muito Baixa</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">Pri.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">Limite</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Muito Alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Baixa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Muito Baixa</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 2f98699..53317cc 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -208,214 +208,231 @@ Sair assim mesmo?</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">P/ Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">P/ Baixo</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">E-mail Padrão</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished">Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished">Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished">Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/appearance.ts b/i18n/pt_BR/appearance.ts
index bee8fa2..cd0bb6e 100644
--- a/i18n/pt_BR/appearance.ts
+++ b/i18n/pt_BR/appearance.ts
@@ -1,142 +1,188 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
-        <translation type="unfinished">Aparncia</translation>
+        <source>Settings...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
-        <translation type="unfinished"></translation>
+        <source>Appearance</source>
+        <translation type="unfinished">Aparncia</translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+    <message>
+        <source>Appearance</source>
+        <translation type="obsolete">Aparncia</translation>
+    </message>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/checkbook.ts b/i18n/pt_BR/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/pt_BR/checkbook.ts
+++ b/i18n/pt_BR/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/pt_BR/embeddedkonsole.ts b/i18n/pt_BR/embeddedkonsole.ts
index 3cfe3fc..bf31588 100644
--- a/i18n/pt_BR/embeddedkonsole.ts
+++ b/i18n/pt_BR/embeddedkonsole.ts
@@ -1,90 +1,94 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Seleção de Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished">&lt;B&gt;Comandos&lt;/B&gt;</translation>
     </message>
     <message>
         <source>Commands</source>
         <translation type="unfinished">Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished">&lt;B&gt;Comandos Sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Up</source>
         <translation>Acima</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Aba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abaixo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entra</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Fixa Média</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Fixa Pequena</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index 7e5a94f..677554e 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -2,363 +2,370 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Enviar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Localizar</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Tarefas completadas</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Sem Espaço</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">Tarefas não pode
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Tarefas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Lista de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>D&amp;ue</source>
         <translation type="obsolete">&amp;Prazo</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="obsolete">Prioridade:</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="obsolete">2 - Alta</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Completada</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="obsolete">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Baixa</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="obsolete">1 - Muito Alta</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Categoria:</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="obsolete">Nova Tarefa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Muito Baixa</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Muito Alta</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Alta</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Baixa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Muito Baixa</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index dbaa6eb..7f41e3d 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -224,214 +224,231 @@ Izhod?</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Uvozi vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Pisava</translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished">Mala</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished">Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished">Velika</translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">Dol</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Default Email</source>
         <translation type="obsolete">Privzeta epošta</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="obsolete">Epošta</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="obsolete">Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Delovno mesto</translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="obsolete">Podjetje</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="obsolete">Skupine</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Mesto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Pokrajina</translation>
     </message>
     <message>
diff --git a/i18n/sl/appearance.ts b/i18n/sl/appearance.ts
index c2b7f19..2839eb6 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -1,142 +1,314 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Appearance</name>
+    <message>
+        <source>Settings...</source>
+        <translation type="unfinished">Nastavitve...</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation type="unfinished">Trenutna shema</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Izbriši</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Shrani</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation type="unfinished">Stil zavihka:</translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation type="unfinished">Zavihki</translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation type="unfinished">Zavihki - ikone</translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation type="unfinished">Roletni seznam</translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation type="unfinished">Roletni seznam - ikone</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished">Zgoraj</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished">Spodaj</translation>
+    </message>
+    <message>
+        <source>Appearance</source>
+        <translation type="unfinished">Videz</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation type="unfinished">Stil</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished">Pisava</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished">Barve</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished">Napredno</translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished">Ponovno zaženi</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">Da</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">Ne</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation type="unfinished">Izbriši shemo</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation type="unfinished">Ali res želite izbrisati
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation type="unfinished">Ne morem izbrisati trenutne sheme.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppearanceSettings</name>
     <message>
         <source>Appearance</source>
-        <translation>Videz</translation>
+        <translation type="obsolete">Videz</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation>Stil</translation>
+        <translation type="obsolete">Stil</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation>Trenutna shema</translation>
+        <translation type="obsolete">Trenutna shema</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Shrani</translation>
+        <translation type="obsolete">Shrani</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation>Barve</translation>
+        <translation type="obsolete">Barve</translation>
     </message>
     <message>
         <source>Browse...</source>
-        <translation>Prebrskaj...</translation>
+        <translation type="obsolete">Prebrskaj...</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation>Ozadje</translation>
+        <translation type="obsolete">Ozadje</translation>
     </message>
     <message>
         <source>Edit current scheme...</source>
-        <translation>Nastavi trenutno shemo...</translation>
+        <translation type="obsolete">Nastavi trenutno shemo...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Izbriši</translation>
+        <translation type="obsolete">Izbriši</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation>Ali res želite izbrisati
+        <translation type="obsolete">Ali res želite izbrisati
 </translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Da</translation>
+        <translation type="obsolete">Da</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Ne</translation>
+        <translation type="obsolete">Ne</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation>Izbriši shemo</translation>
+        <translation type="obsolete">Izbriši shemo</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Ne morem izbrisati trenutne sheme.</translation>
+        <translation type="obsolete">Ne morem izbrisati trenutne sheme.</translation>
     </message>
     <message>
         <source>Select</source>
-        <translation>Izberi</translation>
+        <translation type="obsolete">Izberi</translation>
     </message>
     <message>
         <source>Enable background image</source>
-        <translation>Vklopi sliko v ozadju</translation>
+        <translation type="obsolete">Vklopi sliko v ozadju</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation>Privzeto</translation>
+        <translation type="obsolete">Privzeto</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation>Pisava</translation>
+        <translation type="obsolete">Pisava</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Velikost</translation>
+        <translation type="obsolete">Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation>Hitra lisica skoči čez lenega psa</translation>
+        <translation type="obsolete">Hitra lisica skoči čez lenega psa</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Ponovno zaženi</translation>
+        <translation type="obsolete">Ponovno zaženi</translation>
     </message>
     <message>
         <source>Do you want to restart Opie now?</source>
-        <translation>Ali želite zdaj ponovno zagnati Opie?</translation>
+        <translation type="obsolete">Ali želite zdaj ponovno zagnati Opie?</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation>Nastavitve...</translation>
+        <translation type="obsolete">Nastavitve...</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation>Stil zavihka:</translation>
+        <translation type="obsolete">Stil zavihka:</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation>Zavihki</translation>
+        <translation type="obsolete">Zavihki</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation>Zavihki - ikone</translation>
+        <translation type="obsolete">Zavihki - ikone</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation>Roletni seznam</translation>
+        <translation type="obsolete">Roletni seznam</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation>Roletni seznam - ikone</translation>
+        <translation type="obsolete">Roletni seznam - ikone</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation>Zgoraj</translation>
+        <translation type="obsolete">Zgoraj</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>Spodaj</translation>
+        <translation type="obsolete">Spodaj</translation>
     </message>
     <message>
         <source>Enable advanced options in Opie apps</source>
-        <translation>Vklopi napredne izbire v Opie programih</translation>
+        <translation type="obsolete">Vklopi napredne izbire v Opie programih</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>Napredno</translation>
+        <translation type="obsolete">Napredno</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Uredi shemo</translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/checkbook.ts b/i18n/sl/checkbook.ts
index 1a57289..ac79455 100644
--- a/i18n/sl/checkbook.ts
+++ b/i18n/sl/checkbook.ts
@@ -55,248 +55,332 @@
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Password protect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QCheckDetailsBase</name>
     <message>
         <source>Transaction Details</source>
         <translation type="obsolete">Podrobnosti transakcije</translation>
     </message>
 </context>
 <context>
     <name>QCheckEntry</name>
     <message>
         <source>Automobile</source>
         <translation type="obsolete">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="obsolete">Račun</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="obsolete">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="obsolete">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="obsolete">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="obsolete">DVDji</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation type="obsolete">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="obsolete">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="obsolete">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="obsolete">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="obsolete">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="obsolete">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
diff --git a/i18n/sl/embeddedkonsole.ts b/i18n/sl/embeddedkonsole.ts
index 65bbdba..d174f70 100644
--- a/i18n/sl/embeddedkonsole.ts
+++ b/i18n/sl/embeddedkonsole.ts
@@ -1,92 +1,92 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Izbira ukazov</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Ukazi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Ukazi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Predlagani ukazi&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
     <message>
         <source>Form1</source>
-        <translation type="obsolete">Obrazec1</translation>
+        <translation type="unfinished">Obrazec1</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Mikro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Majne fiksne</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Srednje fiksne</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Presledek</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index 2bf42fa..bc0d9a3 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -1,132 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Novo opravilo</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Uredi opravilo</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished">Poglej opravila</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">Izbriši...</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished">Izbriši vse...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Podvoji</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Prežarči</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Najdi</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished">Končana opravila</translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished">Prikaži rok</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished">Podatki</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategorija</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Izbire</translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Vse kategorije</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">Ne uspem
 shraniti vaših sprememb.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Opravki</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished">Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Neizpolnjeno</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="obsolete">Seznam opravkov</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
@@ -153,247 +149,258 @@ Izhod?</translation>
         <source>4 - Low</source>
         <translation type="obsolete">4 - Nizka</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="obsolete">5 - Zelo nizka</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="obsolete">Kategorija:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="obsolete">&amp;Končano</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="obsolete">Z&amp;apade</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="obsolete">1 Jan 2001</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="obsolete">Povzetek:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="obsolete">Napredovanje:</translation>
     </message>
     <message>
         <source>0%</source>
         <translation type="obsolete">0%</translation>
     </message>
     <message>
         <source>20%</source>
         <translation type="obsolete">20%</translation>
     </message>
     <message>
         <source>40%</source>
         <translation type="obsolete">40%</translation>
     </message>
     <message>
         <source>60%</source>
         <translation type="obsolete">60%</translation>
     </message>
     <message>
         <source>80%</source>
         <translation type="obsolete">80%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="obsolete">100%</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Uredi opravilo</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished">K.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished">Pred.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Zelo visoka</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Visoka</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normalna</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Nizka</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Zelo nizka</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/status.sh b/i18n/status.sh
new file mode 100755
index 0000000..3bffe12
--- a/dev/null
+++ b/i18n/status.sh
@@ -0,0 +1,7 @@
+#/bin/sh
+echo "number of strings: "
+grep translation go.ts | wc -l
+echo "unfinished: "
+grep translation go.ts | grep type=\"unfinished\" | wc -l
+echo "obsolete: "
+grep translation go.ts | grep type=\"obsolete\" | wc -l
diff --git a/i18n/zh_CN/addressbook.ts b/i18n/zh_CN/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/zh_CN/addressbook.ts
+++ b/i18n/zh_CN/addressbook.ts
@@ -94,214 +94,231 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/appearance.ts b/i18n/zh_CN/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/zh_CN/appearance.ts
+++ b/i18n/zh_CN/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/checkbook.ts b/i18n/zh_CN/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/zh_CN/checkbook.ts
+++ b/i18n/zh_CN/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/zh_CN/embeddedkonsole.ts b/i18n/zh_CN/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/zh_CN/embeddedkonsole.ts
+++ b/i18n/zh_CN/embeddedkonsole.ts
@@ -1,89 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/todolist.ts b/i18n/zh_CN/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/zh_CN/todolist.ts
+++ b/i18n/zh_CN/todolist.ts
@@ -1,308 +1,311 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 4d21cc3..b7a42e8 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -94,214 +94,231 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OContacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Contact ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;AllYes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index ec16822..1577ff1 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -1,141 +1,183 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppearanceSettings</name>
+    <name>Appearance</name>
     <message>
-        <source>Appearance</source>
+        <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style</source>
+        <source>Current scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current scheme</source>
+        <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Colors</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>Force styling for all applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Background</source>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit current scheme...</source>
+        <source>Binary file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
+        <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete scheme</source>
+        <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to delete current scheme.</source>
+        <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select</source>
+        <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable background image</source>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size</source>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart</source>
+        <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to restart Opie now?</source>
+        <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings...</source>
+        <source>Do you want to restart %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab style:</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs w/icons</source>
+        <source>Save Scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list</source>
+        <source>Save scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drop down list w/icons</source>
+        <source>Scheme does already exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Top</source>
+        <source>Delete scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bottom</source>
+        <source>Do you really want to delete
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable advanced options in Opie apps</source>
+        <source>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>AppearanceSettings</name>
+</context>
+<context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/checkbook.ts b/i18n/zh_TW/checkbook.ts
index 5320a27..77b4422 100644
--- a/i18n/zh_TW/checkbook.ts
+++ b/i18n/zh_TW/checkbook.ts
@@ -55,248 +55,332 @@
     </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>
diff --git a/i18n/zh_TW/embeddedkonsole.ts b/i18n/zh_TW/embeddedkonsole.ts
index 7808a2e..4e578e6 100644
--- a/i18n/zh_TW/embeddedkonsole.ts
+++ b/i18n/zh_TW/embeddedkonsole.ts
@@ -1,89 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Form1</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 9692636..962b89d 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -1,308 +1,311 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over due</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reminders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Ref</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAdvanced</name>
     <message>
         <source>Form2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintain Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvancedImpl</name>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Form3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>